Commit 8f326d52 authored by Jonathan Marten's avatar Jonathan Marten

Port KAction -> QAction

parent 6316fcd4
......@@ -36,7 +36,6 @@ class QTabWidget;
// KDE
class KAccel;
class KAction;
class KToggleAction;
#include <kxmlguiwindow.h>
......
......@@ -31,7 +31,6 @@ class MixDevice;
class ViewBase;
// KDE
class KAction;
class KComboBox;
// Qt
......@@ -50,7 +49,7 @@ public:
QWidget* parent, ViewBase* view, ProfControl* pctl);
~MDWEnum();
void addActionToPopup( KAction *action );
void addActionToPopup( QAction *action );
QSizePolicy sizePolicy() const;
bool eventFilter( QObject* obj, QEvent* e ) Q_DECL_OVERRIDE;
......
......@@ -30,7 +30,7 @@
#include <QString>
MDWMoveAction::MDWMoveAction(shared_ptr<MixDevice> md, QObject *parent)
: KAction(parent), m_mixDevice(md)
: QAction(parent), m_mixDevice(md)
{
Q_ASSERT(md);
......
......@@ -21,11 +21,11 @@
#ifndef MDWMoveAction_h
#define MDWMoveAction_h
#include <KAction>
#include <QAction>
#include "core/mixdevice.h"
class MDWMoveAction : public KAction
class MDWMoveAction : public QAction
{
Q_OBJECT
......
......@@ -24,7 +24,6 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kconfig.h>
#include <kaction.h>
#include <kglobalaccel.h>
#include <kactioncollection.h>
#include <ktoggleaction.h>
......@@ -38,8 +37,8 @@
#include <QMouseEvent>
#include <QLabel>
#include <qpixmap.h>
//#include <qwmatrix.h>
#include <QBoxLayout>
#include <QAction>
#include "core/ControlManager.h"
#include "core/mixer.h"
......@@ -102,7 +101,7 @@ void MDWSlider::createActions()
taction->setText( i18n("&Split Channels") );
connect( taction, SIGNAL(triggered(bool)), SLOT(toggleStereoLinked()) );
// KAction *action;
// QAction *action;
// if ( ! m_mixdevice->mixer()->isDynamic() ) {
// action = _mdwActions->add<KToggleAction>( "hide" );
// action->setText( i18n("&Hide") );
......@@ -947,7 +946,7 @@ void MDWSlider::volumeChangeInternal(Volume& vol, QList<QAbstractSlider *>& ref_
/**
This slot is called, when a user has clicked the recsrc button. Also it is called by any other
associated KAction like the context menu.
associated QAction like the context menu.
*/
void MDWSlider::toggleRecsrc()
{
......@@ -966,7 +965,7 @@ void MDWSlider::setRecsrc(bool value )
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
associated KAction like the context menu.
associated QAction like the context menu.
*/
void MDWSlider::toggleMuted()
{
......@@ -1218,13 +1217,13 @@ void MDWSlider::showMoveMenu()
m_moveMenu->clear();
// Default
KAction *a = new KAction(_mdwMoveActions);
QAction *a = new QAction(_mdwMoveActions);
a->setText( i18n("Automatic According to Category") );
_mdwMoveActions->addAction( QString("moveautomatic"), a);
connect(a, SIGNAL(triggered(bool)), SLOT(moveStreamAutomatic()), Qt::QueuedConnection);
m_moveMenu->addAction( a );
a = new KAction(_mdwMoveActions);
a = new QAction(_mdwMoveActions);
a->setSeparator(true);
_mdwMoveActions->addAction( QString("-"), a);
......
......@@ -34,7 +34,6 @@ class QBoxLayout;
class QToolButton;
class QLabel;
class KAction;
class QMenu;
#include <kshortcut.h>
#include <kiconloader.h>
......@@ -59,7 +58,7 @@ public:
virtual ~MDWSlider();
enum LabelType { LT_ALL, LT_FIRST_CAPTURE, LT_NONE };
void addActionToPopup( KAction *action );
void addActionToPopup( QAction *action );
void createActions();
void createShortcutActions();
......
......@@ -25,7 +25,6 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kconfig.h>
#include <kaction.h>
#include <kglobalaccel.h>
#include <kshortcutsdialog.h>
......@@ -76,7 +75,7 @@ MixDeviceWidget::~MixDeviceWidget()
{
}
void MixDeviceWidget::addActionToPopup( KAction *action )
void MixDeviceWidget::addActionToPopup( QAction *action )
{
_mdwActions->addAction( action->objectName(), action );
}
......
......@@ -31,7 +31,6 @@
#include <qpixmap.h>
class KAction;
class KActionCollection;
class KShortcutsDialog;
......@@ -50,7 +49,7 @@ public:
QWidget* parent, ViewBase*, ProfControl * );
virtual ~MixDeviceWidget();
void addActionToPopup( KAction *action );
void addActionToPopup( QAction *action );
shared_ptr<MixDevice> mixDevice() { return m_mixdevice; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment