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, 12 insertions, 12 deletions

diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 45fbbf31..322f2160 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -19,7 +19,7 @@
  */
 
 
-// Qt
+// TQt
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqslider.h>
@@ -49,7 +49,7 @@
 
 /**
    This widget is embedded in the KMix Main window. Each Hardware Mixer is visualized by one KMixerWidget.
-   KMixerWidget contains
+   KMixerWidget tqcontains
    (a) a headline where you can change Mixer's (if you got more than one Mixer)
    (b) a Tab with 2-4 Tabs (containing View's with sliders, switches and other GUI elements visualizing the Mixer)
    (c) A balancing slider
@@ -57,8 +57,8 @@
 */
 KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
                             MixDevice::DeviceCategory categoryMask,
-                            TQWidget * parent, const char * name, ViewBase::ViewFlags vflags )
-   : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0),
+                            TQWidget * tqparent, const char * name, ViewBase::ViewFlags vflags )
+   : TQWidget( tqparent, name ), _mixer(mixer), m_balanceSlider(0),
      m_topLayout(0),
      m_id( _id ),
      _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ),
@@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
    {
        // No mixer found
        // !! Fix this: This is actually never shown!
-       TQBoxLayout *layout = new TQHBoxLayout( this );
+       TQBoxLayout *tqlayout = new TQHBoxLayout( this );
        TQString s = i18n("Invalid mixer");
        if ( !mixerName.isEmpty() )
 	   s.append(" \"").append(mixerName).append("\"");
        TQLabel *errorLabel = new TQLabel( s, this );
-       errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
-       layout->addWidget( errorLabel );
+       errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
+       tqlayout->addWidget( errorLabel );
    }
 }
 
@@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
 	delete m_topLayout;
     }
 
-    // create main layout
+    // create main tqlayout
     m_topLayout = new TQVBoxLayout( this, 0, 3,  "m_topLayout" );
 
     // Create tabs of input + output + [...]
@@ -133,11 +133,11 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
     // *** Lower part: Slider and Mixer Name ************************************************
     TQHBoxLayout *balanceAndDetail = new TQHBoxLayout( m_topLayout, 8,  "balanceAndDetail");
     // Create the left-right-slider
-    m_balanceSlider = new TQSlider( -100, 100, 25, 0, TQSlider::Horizontal, this, "RightLeft" );
+    m_balanceSlider = new TQSlider( -100, 100, 25, 0, Qt::Horizontal, this, "RightLeft" );
     m_balanceSlider->setTickmarks( TQSlider::Below );
     m_balanceSlider->setTickInterval( 25 );
-    m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() );
-    m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() );
+    m_balanceSlider->setMinimumSize( m_balanceSlider->tqsizeHint() );
+    m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() );
 
     TQLabel *mixerName = new TQLabel(this, "mixerName");
     mixerName->setText( _mixer->mixerName() );
@@ -167,7 +167,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase)
 		_views.push_back(vbase);
 		vbase ->createDeviceWidgets();
 		m_ioTab->addTab( vbase , vbase->caption() );
-		connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) );
+		connect( vbase, TQT_SIGNAL(toggleMenuBar()), tqparentWidget(), TQT_SLOT(toggleMenuBar()) );
 	}
 }