diff options
Diffstat (limited to 'kmix/mdwenum.cpp')
| -rw-r--r-- | kmix/mdwenum.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 708000f2..8449818c 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -31,7 +31,7 @@ #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <kdebug.h> @@ -45,7 +45,7 @@ * The orientation (horizontal, vertical) is ignored */ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, - Qt::Orientation orientation, + TQt::Orientation orientation, TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,false,orientation,parent,mw,name), _label(0), _enumCombo(0), _layout(0) @@ -53,15 +53,15 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, // create actions (on _mdwActions, see MixDeviceWidget) // KStdAction::showMenubar() is in MixDeviceWidget now - new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" ); - new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" ); + new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" ); + new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" ); // create widgets createWidgets(); /* !!! remove this for production version */ m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(), - TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) ); + TDEShortcut(), TDEShortcut(), this, TQ_SLOT( nextEnumId() ) ); installEventFilter( this ); // filter for popup } @@ -73,7 +73,7 @@ MDWEnum::~MDWEnum() void MDWEnum::createWidgets() { - if ( _orientation == Qt::Vertical ) { + if ( _orientation == TQt::Vertical ) { _layout = new TQVBoxLayout( this ); _layout->setAlignment(TQt::AlignHCenter); } @@ -90,7 +90,7 @@ void MDWEnum::createWidgets() _label = new TQLabel( m_mixdevice->name(), this); _layout->addWidget(_label); _label->setFixedHeight(_label->sizeHint().height()); - _enumCombo = new KComboBox( FALSE, this, "mixerCombo" ); + _enumCombo = new KComboBox( false, this, "mixerCombo" ); // ------------ fill ComboBox start ------------ int maxEnumId= m_mixdevice->enumValues().count(); for (int i=0; i<maxEnumId; i++ ) { @@ -99,7 +99,7 @@ void MDWEnum::createWidgets() // ------------ fill ComboBox end -------------- _layout->addWidget(_enumCombo); _enumCombo->setFixedHeight(_enumCombo->sizeHint().height()); - connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) ); + connect( _enumCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setEnumId( int ) ) ); TQToolTip::add( _enumCombo, m_mixdevice->name() ); //_layout->addSpacing( 4 ); @@ -194,8 +194,8 @@ void MDWEnum::setDisabled( bool value ) { bool MDWEnum::eventFilter( TQObject* obj, TQEvent* e ) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *qme = TQT_TQMOUSEEVENT(e); - if (qme->button() == Qt::RightButton) { + TQMouseEvent *qme = static_cast<TQMouseEvent*>(e); + if (qme->button() == TQt::RightButton) { showContextMenu(); return true; } |