TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 18 deletions

diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 35ec4de8..17a5887d 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -46,22 +46,22 @@
  */
 MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
                                  Qt::Orientation orientation,
-                                 TQWidget* parent, ViewBase* mw, const char* name) :
-    MixDeviceWidget(mixer,md,false,orientation,parent,mw,name),
+                                 TQWidget* tqparent, ViewBase* mw, const char* name) :
+    MixDeviceWidget(mixer,md,false,orientation,tqparent,mw,name),
      _label(0), _enumCombo(0), _layout(0)
 {
     // create actions (on _mdwActions, see MixDeviceWidget)
 
     // KStdAction::showMenubar() is in MixDeviceWidget now
-    new KToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
-    new KAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+    new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+    new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
 
     // create widgets
     createWidgets();
 
     /* !!! remove this for production version */
-    m_keys->insert( "Next Value", i18n( "Next Value" ), TQString::null,
-		    KShortcut(), KShortcut(), this, TQT_SLOT( nextEnumId() ) );
+    m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
+		    KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
 
     installEventFilter( this ); // filter for popup
 }
@@ -75,21 +75,21 @@ void MDWEnum::createWidgets()
 {
 	if ( _orientation == Qt::Vertical ) {
 		_layout = new TQVBoxLayout( this );
-		_layout->setAlignment(Qt::AlignHCenter);
+		_layout->tqsetAlignment(TQt::AlignHCenter);
 	}
 	else {
 		_layout = new TQHBoxLayout( this );
-		_layout->setAlignment(Qt::AlignVCenter);
+		_layout->tqsetAlignment(TQt::AlignVCenter);
 	}
 	TQToolTip::add( this, m_mixdevice->name() );
 	
         //this->setStretchFactor( _layout, 0 );
         //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-        //_layout->setSizePolicy(qsp);
+        //_layout->tqsetSizePolicy(qsp);
         //_layout->setSpacing(KDialog::spacingHint());
         _label = new TQLabel( m_mixdevice->name(), this);
 	_layout->addWidget(_label);
-        _label->setFixedHeight(_label->sizeHint().height());
+        _label->setFixedHeight(_label->tqsizeHint().height());
         _enumCombo = new KComboBox( FALSE, this, "mixerCombo" );
 	// ------------ fill ComboBox start ------------
 	int maxEnumId= m_mixdevice->enumValues().count();
@@ -98,8 +98,8 @@ void MDWEnum::createWidgets()
 	}
 	// ------------ fill ComboBox end --------------
 	_layout->addWidget(_enumCombo);
-        _enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
-        connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) );
+        _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height());
+        connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) );
         TQToolTip::add( _enumCombo, m_mixdevice->name() );
 	
 	//_layout->addSpacing( 4 );
@@ -127,13 +127,13 @@ void MDWEnum::showContextMenu()
     menu->popup( pos );
 }
 
-TQSize MDWEnum::sizeHint() const {
+TQSize MDWEnum::tqsizeHint() const {
     if ( _layout != 0 ) {
-	return _layout->sizeHint();
+	return _layout->tqsizeHint();
     }
     else {
-	// layout not (yet) created
-	return TQWidget::sizeHint();
+	// tqlayout not (yet) created
+	return TQWidget::tqsizeHint();
     }
 }
 
@@ -188,13 +188,13 @@ void MDWEnum::setDisabled( bool value ) {
 }
 
 /**
- * An event filter for the various QWidgets. We watch for Mouse press Events, so
+ * An event filter for the various TQWidgets. We watch for Mouse press Events, so
  * that we can popup the context menu.
  */
 bool MDWEnum::eventFilter( TQObject* obj, TQEvent* e )
 {
     if (e->type() == TQEvent::MouseButtonPress) {
-	TQMouseEvent *qme = static_cast<TQMouseEvent*>(e);
+	TQMouseEvent *qme = TQT_TQMOUSEEVENT(e);
 	if (qme->button() == Qt::RightButton) {
 	    showContextMenu();
 	    return true;