Rename a number of old tq methods that are no longer tq specific

37 files changed, 201 insertions, 201 deletions

diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index d91d9ea9..27739653 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -236,7 +236,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index b70c2b6c..b2e09726 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <tqbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
 #include <tqradiobutton.h>
@@ -67,15 +67,15 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
       TQHBoxLayout* mixerNameLayout = new TQHBoxLayout( _layout );
       //widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
       //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-      //mixerNameLayout->tqsetSizePolicy(qsp);
+      //mixerNameLayout->setSizePolicy(qsp);
       mixerNameLayout->setSpacing(KDialog::spacingHint());
 
       TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame );
       mixerNameLayout->addWidget(qlbl);
-      qlbl->setFixedHeight(qlbl->tqsizeHint().height());
+      qlbl->setFixedHeight(qlbl->sizeHint().height());
 
       m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" );
-      m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
+      m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
       connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) );
 
       //int id=1;
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 28cf3c3f..5395dd13 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
 
@@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
 	}
     }
     _layout->activate();
-    resize(_layout->tqsizeHint() );
+    resize(_layout->sizeHint() );
     connect( this, TQT_SIGNAL(okClicked())   , this, TQT_SLOT(apply()) );
 }
 
@@ -93,9 +93,9 @@ void DialogViewConfiguration::apply()
     _view.configurationUpdate();
 }
 
-TQSize DialogViewConfiguration::tqsizeHint() const {
-    //    kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n";
-    return _layout->tqsizeHint();
+TQSize DialogViewConfiguration::sizeHint() const {
+    //    kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n";
+    return _layout->sizeHint();
 }
 
 #include "dialogviewconfiguration.moc"
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index c0a80bae..8d64bd27 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -18,7 +18,7 @@ class DialogViewConfiguration : public KDialogBase
     DialogViewConfiguration(TQWidget* parent, ViewBase& view);
     ~DialogViewConfiguration();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
  public slots:
     void apply();
 
diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp
index 7e9fbe02..3ad3ba75 100644
--- a/kmix/kledbutton.cpp
+++ b/kmix/kledbutton.cpp
@@ -33,8 +33,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
 }
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-		       KLed::Shape tqshape, TQWidget *parent, const char *name)
-   : KLed( col, st, look, tqshape, parent, name )
+		       KLed::Shape shape, TQWidget *parent, const char *name)
+   : KLed( col, st, look, shape, parent, name )
 {
 }
 
@@ -66,7 +66,7 @@ bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) {
 
 }	
 
-TQSize KLedButton::tqsizeHint() const
+TQSize KLedButton::sizeHint() const
 {
     return size();
 }
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index da07d492..36572ad2 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -35,11 +35,11 @@ class KLedButton : public KLed  {
   TQ_OBJECT
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
-   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
 	      TQWidget *parent=0, const char *name=0);
    ~KLedButton();	
 
-   TQSize tqsizeHint () const;
+   TQSize sizeHint () const;
    TQSizePolicy sizePolicy () const;
   signals:
    void stateChanged( bool newState );
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 3db2ec09..58fe57f6 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 // include files for KDE
@@ -145,10 +145,10 @@ KMixWindow::initPrefDlg()
 void
 KMixWindow::initWidgets()
 {
-	// Main widget and tqlayout
+	// Main widget and layout
 	setCentralWidget( new TQWidget(  this, "qt_central_widget" ) );
 
-	// Widgets tqlayout
+	// Widgets layout
 	widgetsLayout = new TQVBoxLayout(   centralWidget(), 0, 0, "widgetsLayout" );
 	widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine
 
@@ -157,16 +157,16 @@ KMixWindow::initWidgets()
 	mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" );
         widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
 	TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-	mixerNameLayout->tqsetSizePolicy(qsp);
+	mixerNameLayout->setSizePolicy(qsp);
 	mixerNameLayout->setSpacing(KDialog::spacingHint());
 	TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout );
-	qlbl->setFixedHeight(qlbl->tqsizeHint().height());
+	qlbl->setFixedHeight(qlbl->sizeHint().height());
 	m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" );
-	m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
+	m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
 	connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) );
 	TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
 
-	// Add first tqlayout to widgets
+	// Add first layout to widgets
 	widgetsLayout->addWidget( mixerNameLayout );
 
 	m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" );
@@ -522,11 +522,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
    }
    if ( prefDlg->_rbVertical->isChecked() ) {
       //TQString "For a change of language to take place, quit and restart KDiff3.";
-      //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n";
+      //kdDebug(67100) << "KMix should change toQt::Vertical layout\n";
       m_toplevelOrientation = Qt::Vertical;
    }
    else if ( prefDlg->_rbHorizontal->isChecked() ) {
-     //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n";
+     //kdDebug(67100) << "KMix should change toQt::Horizontal layout\n";
      m_toplevelOrientation = Qt::Horizontal;
    }
    m_autoStart = prefDlg->m_autoStartChk->isChecked();
@@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
        show();
    }
 
-   this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds)
+   this->repaint(); // make KMix look fast (saveConfig() often uses several seconds)
    kapp->processEvents();
    saveConfig();
 }
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 741cbd0e..871c47a7 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -27,7 +27,7 @@
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -205,8 +205,8 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
 	// No mixer set by user (kmixappletrc_*) and more than one to choose
 	// We do NOT know which mixer to use => ask the User
 	m_errorLabel = new TQPushButton( i18n("Select Mixer"), this );
-	m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(),  m_errorLabel->tqsizeHint().height() );
-	resize( m_errorLabel->tqsizeHint() );
+	m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(),  m_errorLabel->sizeHint().height() );
+	resize( m_errorLabel->sizeHint() );
 	connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
     }
     else {
@@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) {
 	loadConfig();
 	setColors();
 	
-	const TQSize panelAppletConstrainedSize = tqsizeHint();
+	const TQSize panelAppletConstrainedSize = sizeHint();
 	m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
 	resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
 	//setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
@@ -401,7 +401,7 @@ void KMixApplet::resizeEvent(TQResizeEvent *e)
     }
 
 
-    // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
+    // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
     // So updateGeometry() is amust for us.
     //kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl;
     updateGeometry();
@@ -414,21 +414,21 @@ void KMixApplet::updateGeometrySlot() {
 }
 
 
-TQSize KMixApplet::tqsizeHint() const {
-    //kdDebug(67100) << "KMixApplet::tqsizeHint()\n";
+TQSize KMixApplet::sizeHint() const {
+    //kdDebug(67100) << "KMixApplet::sizeHint()\n";
     TQSize qsz;
     if ( m_errorLabel !=0 ) {
-	qsz = m_errorLabel->tqsizeHint();
+	qsz = m_errorLabel->sizeHint();
     }
     else if (  m_mixerWidget != 0) {
-	qsz = m_mixerWidget->tqsizeHint();
+	qsz = m_mixerWidget->sizeHint();
     }
     else {
 	// During construction of m_mixerWidget or if something goes wrong:
-	// Return something that should resemble our former tqsizeHint().
+	// Return something that should resemble our former sizeHint().
 	qsz = size();
     }
-    //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n";
+    //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n";
     return qsz;
 }
 
@@ -437,12 +437,12 @@ TQSize KMixApplet::tqsizeHint() const {
    using this method. Actually we ignore the passed paramater and just return our preferred size.
 */
 int KMixApplet::widthForHeight(int) const {
-    //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl;
-    return tqsizeHint().width();
+    //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl;
+    return sizeHint().width();
 }
 int KMixApplet::heightForWidth(int) const {
-    //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl;
-    return tqsizeHint().height();
+    //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl;
+    return sizeHint().height();
 }
 
 
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 5f7136ad..de994c84 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -23,7 +23,7 @@
 #define KMIXAPPLET_H
 
 // TQt
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqwidget.h>
 
@@ -88,7 +88,7 @@ public:
    void reportBug();
    void paletteChange ( const TQPalette & oldPalette );
 
-   TQSize tqsizeHint() const;
+   TQSize sizeHint() const;
    TQSizePolicy sizePolicy() const;
    int widthForHeight(int) const;
    int heightForWidth(int) const;
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 039d3237..aff3e500 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip()
         }
 	newToolTipValue = val + 10000*md->isMuted();
 	if ( _oldToolTipValue != newToolTipValue ) {
-	    tip = i18n( "Volume at %1%" ).tqarg( val );
+	    tip = i18n( "Volume at %1%" ).arg( val );
 	    if ( md->isMuted() ) {
 		tip += i18n( " (Muted)" );
 	    }
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 56c90d03..3251db09 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -21,7 +21,7 @@
 
 // TQt
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqstring.h>
 #include <tqtooltip.h>
@@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
    {
        // No mixer found
        // !! Fix this: This is actually never shown!
-       TQBoxLayout *tqlayout = new TQHBoxLayout( this );
+       TQBoxLayout *layout = new TQHBoxLayout( this );
        TQString s = i18n("Invalid mixer");
        if ( !mixerName.isEmpty() )
 	   s.append(" \"").append(mixerName).append("\"");
        TQLabel *errorLabel = new TQLabel( s, this );
-       errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
-       tqlayout->addWidget( errorLabel );
+       errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
+       layout->addWidget( errorLabel );
    }
 }
 
@@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
 	delete m_topLayout;
     }
 
-    // create main tqlayout
+    // create main layout
     m_topLayout = new TQVBoxLayout( this, 0, 3,  "m_topLayout" );
 
     // Create tabs of input + output + [...]
@@ -136,8 +136,8 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
     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->tqsizeHint() );
-    m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() );
+    m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() );
+    m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() );
 
     TQLabel *mixerName = new TQLabel(this, "mixerName");
     mixerName->setText( _mixer->mixerName() );
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index 3cfa42e5..7bcc1d70 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -43,36 +43,36 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
    // general buttons
    m_generalTab = plainPage( /* i18n("&General") */ );
 
-   TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab );
-   tqlayout->setSpacing( KDialog::spacingHint() );
+   TQBoxLayout *layout = new TQVBoxLayout( m_generalTab );
+   layout->setSpacing( KDialog::spacingHint() );
 
    m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab );
-   tqlayout->addWidget( m_dockingChk );
+   layout->addWidget( m_dockingChk );
    TQWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel"));
 
    m_volumeChk = new TQCheckBox(i18n("Enable system tray &volume control"),
 			       m_generalTab);
-   tqlayout->addWidget(m_volumeChk);
+   layout->addWidget(m_volumeChk);
 
    m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab );
-   tqlayout->addWidget( m_showTicks );
+   layout->addWidget( m_showTicks );
    TQWhatsThis::add(m_showTicks,
            i18n("Enable/disable tickmark scales on the sliders"));
 
    m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab );
-   tqlayout->addWidget( m_showLabels );
+   layout->addWidget( m_showLabels );
    TQWhatsThis::add(m_showLabels,
            i18n("Enables/disables description labels above the sliders"));
 
 
    m_onLogin = new TQCheckBox( i18n("Restore volumes on login"), m_generalTab );
-   tqlayout->addWidget( m_onLogin );
+   layout->addWidget( m_onLogin );
 
    m_dockIconMuting = new TQCheckBox( 
             i18n("Middle click on system tray icon toggles muting"), m_generalTab );
-   tqlayout->addWidget( m_dockIconMuting );
+   layout->addWidget( m_dockIconMuting );
 
-   TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout );
+   TQBoxLayout *numbersLayout = new TQHBoxLayout( layout );
    TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
    numbersGroup->setRadioButtonExclusive(true);
    TQLabel* qlbl = new TQLabel(  i18n("Volume Values: "), m_generalTab );
@@ -91,10 +91,10 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
    numbersLayout->addStretch();
 
    m_autoStartChk = new TQCheckBox( i18n("&Autostart"), m_generalTab );
-   tqlayout->addWidget( m_autoStartChk );
+   layout->addWidget( m_autoStartChk );
    TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login"));
 
-   TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout );
+   TQBoxLayout *orientationLayout = new TQHBoxLayout( layout );
    TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab );
    //orientationLayout->add(orientationGroup);
    orientationGroup->setRadioButtonExclusive(true);
@@ -112,7 +112,7 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
    orientationLayout->add(_rbVertical);
 
    orientationLayout->addStretch();
-   tqlayout->addStretch();
+   layout->addStretch();
    enableButtonSeparator(true);
 
    connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) );
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index fea113b5..d65f9a1a 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqpainter.h>
 #include <tqcolor.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqstyle.h>
 
 #include "kglobalsettings.h"
@@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * )
    int sliderPos = positionFromValue( TQRangeControl::value() );
 
    // ------------------------ draw 3d border ---------------------------------------------
-   tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), tqcolorGroup(), TRUE );
+   tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE );
 
 
    // ------------------------ draw lower/left part ----------------------------------------
@@ -396,7 +396,7 @@ int KSmallSlider::goodPart( const TQPoint &p ) const
 }
 
 /***************** SIZE STUFF START ***************/
-TQSize KSmallSlider::tqsizeHint() const
+TQSize KSmallSlider::sizeHint() const
 {
     //constPolish();
     const int length = 25;
@@ -409,7 +409,7 @@ TQSize KSmallSlider::tqsizeHint() const
 }
 
 
-TQSize KSmallSlider::tqminimumSizeHint() const
+TQSize KSmallSlider::minimumSizeHint() const
 {
     TQSize s(10,10);
     return s;
@@ -486,7 +486,7 @@ void KSmallSlider::setGray( bool value )
    {
       grayed = value;
       update();
-      //tqrepaint();
+      //repaint();
    }
 }
 
@@ -501,7 +501,7 @@ void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back )
     colLow = low;
     colBack = back;
     update();
-    //tqrepaint();
+    //repaint();
 }
 
 void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
@@ -510,7 +510,7 @@ void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
     grayLow = low;
     grayBack = back;
     update();
-    //tqrepaint();
+    //repaint();
 }
 
 #include "ksmallslider.moc"
diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h
index 7b672720..2ed0f6e6 100644
--- a/kmix/ksmallslider.h
+++ b/kmix/ksmallslider.h
@@ -42,9 +42,9 @@ class KSmallSlider : public TQWidget, public TQRangeControl
 
     //virtual void setTracking( bool enable );
     //bool tracking() const;
-      TQSize tqsizeHint() const;
+      TQSize sizeHint() const;
       TQSizePolicy sizePolicy() const;
-      TQSize tqminimumSizeHint() const;
+      TQSize minimumSizeHint() const;
 
       int minValue() const;
       int maxValue() const;
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 90ac1350..3cf28ac4 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobject.h>
 #include <tqtooltip.h>
 
@@ -75,21 +75,21 @@ void MDWEnum::createWidgets()
 {
 	if ( _orientation == Qt::Vertical ) {
 		_layout = new TQVBoxLayout( this );
-		_layout->tqsetAlignment(TQt::AlignHCenter);
+		_layout->setAlignment(TQt::AlignHCenter);
 	}
 	else {
 		_layout = new TQHBoxLayout( this );
-		_layout->tqsetAlignment(TQt::AlignVCenter);
+		_layout->setAlignment(TQt::AlignVCenter);
 	}
 	TQToolTip::add( this, m_mixdevice->name() );
 	
         //this->setStretchFactor( _layout, 0 );
         //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-        //_layout->tqsetSizePolicy(qsp);
+        //_layout->setSizePolicy(qsp);
         //_layout->setSpacing(KDialog::spacingHint());
         _label = new TQLabel( m_mixdevice->name(), this);
 	_layout->addWidget(_label);
-        _label->setFixedHeight(_label->tqsizeHint().height());
+        _label->setFixedHeight(_label->sizeHint().height());
         _enumCombo = new KComboBox( FALSE, this, "mixerCombo" );
 	// ------------ fill ComboBox start ------------
 	int maxEnumId= m_mixdevice->enumValues().count();
@@ -98,7 +98,7 @@ void MDWEnum::createWidgets()
 	}
 	// ------------ fill ComboBox end --------------
 	_layout->addWidget(_enumCombo);
-        _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height());
+        _enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
         connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) );
         TQToolTip::add( _enumCombo, m_mixdevice->name() );
 	
@@ -127,13 +127,13 @@ void MDWEnum::showContextMenu()
     menu->popup( pos );
 }
 
-TQSize MDWEnum::tqsizeHint() const {
+TQSize MDWEnum::sizeHint() const {
     if ( _layout != 0 ) {
-	return _layout->tqsizeHint();
+	return _layout->sizeHint();
     }
     else {
-	// tqlayout not (yet) created
-	return TQWidget::tqsizeHint();
+	// layout not (yet) created
+	return TQWidget::sizeHint();
     }
 }
 
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index 0a77506f..398afa93 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -51,7 +51,7 @@ public:
     ~MDWEnum();
 
     void addActionToPopup( KAction *action );
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     bool eventFilter( TQObject* obj, TQEvent* e );
 
 public slots:
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 8d363c5e..9e6fe11e 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -33,7 +33,7 @@
 #include <tqcursor.h>
 #include <tqslider.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqtooltip.h>
 #include <tqwmatrix.h>
@@ -81,11 +81,11 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
 	// create widgets
 	createWidgets( showMuteLED, showRecordLED );
 
-	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
-	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
-	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
 
 	installEventFilter( this ); // filter for popup
@@ -115,25 +115,25 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 {
     if ( _orientation == Qt::Vertical ) {
 	_layout = new TQVBoxLayout( this );
-	_layout->tqsetAlignment(TQt::AlignCenter);
+	_layout->setAlignment(TQt::AlignCenter);
     }
     else {
 	_layout = new TQHBoxLayout( this );
-	_layout->tqsetAlignment(TQt::AlignCenter);
+	_layout->setAlignment(TQt::AlignCenter);
     }
 
 	 // -- MAIN SLIDERS LAYOUT  ---
 	 TQBoxLayout *slidersLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 slidersLayout = new TQHBoxLayout( _layout );
-		 slidersLayout->tqsetAlignment(TQt::AlignVCenter);
+		 slidersLayout->setAlignment(TQt::AlignVCenter);
 	 }
 	 else {
 		 slidersLayout = new TQVBoxLayout( _layout );
-		 slidersLayout->tqsetAlignment(TQt::AlignHCenter);
+		 slidersLayout->setAlignment(TQt::AlignHCenter);
 	 }
 
-	 /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ?
+	 /* cesken: This is inconsistent. Why should vertical and horizontal layout differ?
 	  *         Also it eats too much space - especially when you don't show sliders at all.
 	  *         Even more on the vertical panel applet (see Bug #97667)
 	     if ( _orientation == Qt::Horizontal )
@@ -145,11 +145,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 	 TQBoxLayout *labelLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 labelLayout = new TQVBoxLayout( slidersLayout );
-		 labelLayout->tqsetAlignment(TQt::AlignHCenter);
+		 labelLayout->setAlignment(TQt::AlignHCenter);
 	 }
 	 else {
 		 labelLayout = new TQHBoxLayout( slidersLayout );
-		 labelLayout->tqsetAlignment(TQt::AlignVCenter);
+		 labelLayout->setAlignment(TQt::AlignVCenter);
 	 }
     if ( _orientation == Qt::Vertical ) {
 		 m_label = new VerticalText( this, m_mixdevice->name().utf8().data() );
@@ -183,22 +183,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 	 TQBoxLayout *sliLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 sliLayout = new TQVBoxLayout( slidersLayout );
-		 sliLayout->tqsetAlignment(TQt::AlignHCenter);
+		 sliLayout->setAlignment(TQt::AlignHCenter);
     }
     else {
 		 sliLayout = new TQHBoxLayout( slidersLayout );
-		 sliLayout->tqsetAlignment(TQt::AlignVCenter);
+		 sliLayout->setAlignment(TQt::AlignVCenter);
 	 }
 
 	 // --- ICON  ----------------------------
     TQBoxLayout *iconLayout;
     if ( _orientation == Qt::Vertical ) {
 		 iconLayout = new TQHBoxLayout( sliLayout );
-		 iconLayout->tqsetAlignment(TQt::AlignVCenter);
+		 iconLayout->setAlignment(TQt::AlignVCenter);
 	 }
 	 else {
 		 iconLayout = new TQVBoxLayout( sliLayout );
-		 iconLayout->tqsetAlignment(TQt::AlignHCenter);
+		 iconLayout->setAlignment(TQt::AlignHCenter);
 	 }
 
 	 m_iconLabel = 0L;
@@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 
 	 // --- MUTE LED
 	 if ( showMuteLED ) {
-		 TQBoxLayout *ledtqlayout;
+		 TQBoxLayout *ledlayout;
 		 if ( _orientation == Qt::Vertical ) {
-			 ledtqlayout = new TQHBoxLayout( sliLayout );
-			 ledtqlayout->tqsetAlignment(TQt::AlignVCenter);
+			 ledlayout = new TQHBoxLayout( sliLayout );
+			 ledlayout->setAlignment(TQt::AlignVCenter);
 		 }
 		 else {
-			 ledtqlayout = new TQVBoxLayout( sliLayout );
-			 ledtqlayout->tqsetAlignment(TQt::AlignHCenter);
+			 ledlayout = new TQVBoxLayout( sliLayout );
+			 ledlayout->setAlignment(TQt::AlignHCenter);
 		 }
 
 		 if( m_mixdevice->hasMute() )
 		 {
-			 ledtqlayout->addStretch();
+			 ledlayout->addStretch();
 			 // create mute LED
 			 m_muteLED = new KLedButton( TQt::green, KLed::On, KLed::Sunken,
 					 KLed::Circular, this, "MuteLED" );
 			 m_muteLED->setFixedSize( TQSize(16, 16) );
 			 m_muteLED->resize( TQSize(16, 16) );
-			 ledtqlayout->addWidget( m_muteLED );
+			 ledlayout->addWidget( m_muteLED );
 			 TQToolTip::add( m_muteLED, i18n( "Mute" ) );
 			 connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) );
 			 m_muteLED->installEventFilter( this );
-			 ledtqlayout->addStretch();
+			 ledlayout->addStretch();
 		 } // has Mute LED
 		 else {
 			 // we don't have a MUTE LED. We create a dummy widget
 			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
-			 ledtqlayout->addWidget(qw);
+			 ledlayout->addWidget(qw);
 			 qw->installEventFilter( this );
 		 } // has no Mute LED
 
@@ -253,11 +253,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 	 TQBoxLayout *volLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 volLayout = new TQHBoxLayout( sliLayout );
-		 volLayout->tqsetAlignment(TQt::AlignVCenter);
+		 volLayout->setAlignment(TQt::AlignVCenter);
 	 }
 	 else {
 		 volLayout = new TQVBoxLayout( sliLayout );
-		 volLayout->tqsetAlignment(TQt::AlignHCenter);
+		 volLayout->setAlignment(TQt::AlignHCenter);
 	 }
 
 	 // Sliders and volume number indication
@@ -273,11 +273,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 
 		 if ( _orientation == Qt::Vertical ) {
 		   slinumLayout = new TQVBoxLayout( volLayout );
-		   slinumLayout->tqsetAlignment(TQt::AlignHCenter);
+		   slinumLayout->setAlignment(TQt::AlignHCenter);
 		 }
 		 else {
 		   slinumLayout = new TQHBoxLayout( volLayout );
-		   slinumLayout->tqsetAlignment(TQt::AlignVCenter);
+		   slinumLayout->setAlignment(TQt::AlignVCenter);
 		 }
 
 		 // create labels to hold volume values (taken from qamix/kamix)
@@ -285,7 +285,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 slinumLayout->addWidget( number );
 		 number->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 		 number->setLineWidth( 2 );
-		 number->setMinimumWidth( number->tqsizeHint().width() );
+		 number->setMinimumWidth( number->sizeHint().width() );
 		 number->setPaletteBackgroundColor( TQColor(190, 250, 190) );
 		 // don't show the value by default
 		 number->hide();
@@ -302,7 +302,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 slider = new TQSlider( 0, maxvol, maxvol/10,
 					 maxvol - m_mixdevice->getVolume( chid ), _orientation,
 					 this, m_mixdevice->name().ascii() );
-			 slider->setMinimumSize( slider->tqsizeHint() );
+			 slider->setMinimumSize( slider->sizeHint() );
 		 }
 
 		 slider->setBackgroundOrigin(AncestorOrigin);
@@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 slider->hide();
 			 number->hide();
 		 }
-		 slinumLayout->addWidget( slider );  // add to tqlayout
+		 slinumLayout->addWidget( slider );  // add to layout
 		 m_sliders.append ( slider );   // add to list
 		 _slidersChids.append(chid);        // Remember slider-chid association
 		 connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) );
@@ -327,27 +327,27 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 sliLayout->addSpacing( 5 );
 
 		 // --- LED LAYOUT TO CENTER ---
-		 TQBoxLayout *rectqlayout;
+		 TQBoxLayout *reclayout;
 		 if ( _orientation == Qt::Vertical ) {
-			 rectqlayout = new TQHBoxLayout( sliLayout );
-			 rectqlayout->tqsetAlignment(TQt::AlignVCenter);
+			 reclayout = new TQHBoxLayout( sliLayout );
+			 reclayout->setAlignment(TQt::AlignVCenter);
 		 }
 		 else {
-			 rectqlayout = new TQVBoxLayout( sliLayout );
-			 rectqlayout->tqsetAlignment(TQt::AlignHCenter);
+			 reclayout = new TQVBoxLayout( sliLayout );
+			 reclayout->setAlignment(TQt::AlignHCenter);
 		 }
 
 		 if( m_mixdevice->isRecordable() ) {
-			 rectqlayout->addStretch();
+			 reclayout->addStretch();
 			 m_recordLED = new KLedButton( TQt::red,
 					 m_mixdevice->isRecSource()?KLed::On:KLed::Off,
 					 KLed::Sunken, KLed::Circular, this, "RecordLED" );
 			 m_recordLED->setFixedSize( TQSize(16, 16) );
-			 rectqlayout->addWidget( m_recordLED );
+			 reclayout->addWidget( m_recordLED );
 			 connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool)));
 			 m_recordLED->installEventFilter( this );
                          TQToolTip::add( m_recordLED, i18n( "Record" ) );
-			 rectqlayout->addStretch();
+			 reclayout->addStretch();
 		 }
 		 else
 		 {
@@ -355,12 +355,12 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
-			 rectqlayout->addWidget(qw);
+			 reclayout->addWidget(qw);
 			 qw->installEventFilter( this );
 		 } // has no Record LED
 	 } // showRecordLED
 
-	tqlayout()->activate();
+	layout()->activate();
 }
 
 
@@ -432,13 +432,13 @@ MDWSlider::setIcon( int icontype )
          m_iconLabel->resize( 10, 10 );
       } else
          m_iconLabel->setPixmap( miniDevPM );
-      m_iconLabel->tqsetAlignment( TQt::AlignCenter );
+      m_iconLabel->setAlignment( TQt::AlignCenter );
    } else
    {
       kdError(67100) << "Pixmap missing." << endl;
    }
 
-   tqlayout()->activate();
+   layout()->activate();
 }
 
 bool
@@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value)
    if( slider && static_cast<TQSlider *>(slider)->tickmarks() )
       setTicks( true );
 
-   tqlayout()->activate();
+   layout()->activate();
 }
 
 
@@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value)
    else
       m_label->hide();
 
-   tqlayout()->activate();
+   layout()->activate();
 }
 
 void
@@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks )
 		}
 	}
 
-	tqlayout()->activate();
+	layout()->activate();
 }
 
 void
@@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle )
 	    }
 	}
     }
-    tqlayout()->activate();
+    layout()->activate();
 }
 
 void
@@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value)
 	    else
 		m_iconLabel->hide();
 
-	    tqlayout()->activate();
+	    layout()->activate();
 	}
     } // if it has an icon
 }
@@ -934,13 +934,13 @@ void MDWSlider::showContextMenu()
 	menu->popup( pos );
 }
 
-TQSize MDWSlider::tqsizeHint() const {
+TQSize MDWSlider::sizeHint() const {
 	if ( _layout != 0 ) {
-		return _layout->tqsizeHint();
+		return _layout->sizeHint();
 	}
 	else {
-		// tqlayout not (yet) created
-		return TQWidget::tqsizeHint();
+		// layout not (yet) created
+		return TQWidget::sizeHint();
 	}
 }
 
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 61a95c96..49b3d700 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -77,7 +77,7 @@ public:
     void setValueStyle( ValueStyle valueStyle );
     void setColors( TQColor high, TQColor low, TQColor back );
     void setMutedColors( TQColor high, TQColor low, TQColor back );
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     bool eventFilter( TQObject* obj, TQEvent* e );
     TQSizePolicy sizePolicy() const;
 
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 056bca57..fc2149f2 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobject.h>
 #include <tqslider.h>
 #include <tqtooltip.h>
@@ -79,11 +79,11 @@ void MDWSwitch::createWidgets()
 {
 	if ( _orientation == Qt::Vertical ) {
 		_layout = new TQVBoxLayout( this );
-		_layout->tqsetAlignment(TQt::AlignHCenter);
+		_layout->setAlignment(TQt::AlignHCenter);
 	}
 	else {
 		_layout = new TQHBoxLayout( this );
-		_layout->tqsetAlignment(TQt::AlignVCenter);
+		_layout->setAlignment(TQt::AlignVCenter);
 	}
 	TQToolTip::add( this, m_mixdevice->name() );
 	
@@ -164,13 +164,13 @@ void MDWSwitch::showContextMenu()
     menu->popup( pos );
 }
 
-TQSize MDWSwitch::tqsizeHint() const {
+TQSize MDWSwitch::sizeHint() const {
     if ( _layout != 0 ) {
-	return _layout->tqsizeHint();
+	return _layout->sizeHint();
     }
     else {
-	// tqlayout not (yet) created
-	return TQWidget::tqsizeHint();
+	// layout not (yet) created
+	return TQWidget::sizeHint();
     }
 }
 
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 6c6f3bbf..5b4b15e0 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -61,7 +61,7 @@ public:
     ~MDWSwitch();
 
     void addActionToPopup( KAction *action );
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     void setBackgroundMode(BackgroundMode m);
     bool eventFilter( TQObject* obj, TQEvent* e );
 
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index f90a9455..f322acbe 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -33,7 +33,7 @@
 #include <tqcursor.h>
 #include <tqslider.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqtooltip.h>
 #include <tqwmatrix.h>
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index dc4935c4..6c8c1783 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -115,7 +115,7 @@ Mixer_ALSA::open()
 
     // Card information
     if ((unsigned)m_devnum > 31) m_devnum = -1;
-    devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum);
+    devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum);
 
     TQString probeMessage;
 
diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 051f0c53..66e0241c 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -148,9 +148,9 @@ void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQS
 			TQString mixerName = mixer->mixerName();
 			mixerName.replace(":","_");
 			TQString primaryKeyOfMixer = TQString("%1::%2:%3")
-			    .tqarg(driverName)
-			    .tqarg(mixerName)
-			    .tqarg(mixerNums[mixer->mixerName()]);
+			    .arg(driverName)
+			    .arg(mixerName)
+			    .arg(mixerNums[mixer->mixerName()]);
 			// The following 3 replaces are for not messing up the config file
 			primaryKeyOfMixer.replace("]","_");
 			primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe
diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp
index aabe8a23..77bda1af 100644
--- a/kmix/verticaltext.cpp
+++ b/kmix/verticaltext.cpp
@@ -46,7 +46,7 @@ void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) {
 	paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) );
 }
 
-TQSize VerticalText::tqsizeHint() const {
+TQSize VerticalText::sizeHint() const {
     return TQSize(20,100); // !! UGLY. Should be reworked
 }
 
diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h
index 1e621e83..c378bafc 100644
--- a/kmix/verticaltext.h
+++ b/kmix/verticaltext.h
@@ -9,7 +9,7 @@ public:
     VerticalText(TQWidget * parent, const char * name, WFlags f = 0);
     ~VerticalText();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     TQSizePolicy sizePolicy () const;
 	
 protected:
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 6b25dde0..0615c85e 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -22,7 +22,7 @@
 
 // TQt
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 // KDE
@@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
 
     if ( _viewOrientation == Qt::Horizontal ) {
 	_layoutMDW = new TQHBoxLayout( this );
-	tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
     }
     else {
 	_layoutMDW = new TQVBoxLayout( this );
-	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     }
 
 
@@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() {
 }
 
 
-TQSize ViewApplet::tqsizeHint() const {
-    // Basically out main tqlayout knows very good what the sizes should be
-    TQSize qsz = _layoutMDW->tqsizeHint();
-    //kdDebug(67100) << "ViewApplet::tqsizeHint(): NewSize is " << qsz << "\n";
+TQSize ViewApplet::sizeHint() const {
+    // Basically out main layout knows very good what the sizes should be
+    TQSize qsz = _layoutMDW->sizeHint();
+    //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n";
     return qsz;
 }
 
@@ -196,7 +196,7 @@ void ViewApplet::resizeEvent(TQResizeEvent *qre)
     //    kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl;
     //TQWidget::resizeEvent(qre);
 
-    // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
+    // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
     // So updateGeometry() is amust for us.
     updateGeometry();
 }
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index 38d21465..400e45f5 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -25,7 +25,7 @@ public:
     virtual void constructionFinished();
     virtual void configurationUpdate();
 
-    TQSize       tqsizeHint() const;
+    TQSize       sizeHint() const;
     TQSizePolicy sizePolicy() const;
     virtual void resizeEvent(TQResizeEvent*);
 
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 859993bb..d8fda5a8 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -24,7 +24,7 @@
 // TQt
 #include <tqwidget.h>
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqpushbutton.h>
 #include <tqdatetime.h>
@@ -46,9 +46,9 @@
 ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
       : ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
 {
-    TQBoxLayout *tqlayout = new TQHBoxLayout( this );
+    TQBoxLayout *layout = new TQHBoxLayout( this );
     _frame = new TQFrame( this );
-    tqlayout->addWidget( _frame );
+    layout->addWidget( _frame );
 
     _frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
     _frame->setLineWidth( 1 );
@@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() {
     }
 }
 
-TQSize ViewDockAreaPopup::tqsizeHint() const {
-    //    kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n";
-    return( _mdw->tqsizeHint() );
+TQSize ViewDockAreaPopup::sizeHint() const {
+    //    kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n";
+    return( _mdw->sizeHint() );
 }
 
 void ViewDockAreaPopup::constructionFinished() {
@@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() {
 
     _mdw->move(0,0);
     _mdw->show();
-    _mdw->resize(_mdw->tqsizeHint() );
-    resize(tqsizeHint());
+    _mdw->resize(_mdw->sizeHint() );
+    resize(sizeHint());
 	 
 }
 
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index a31afa4b..7a30a1a0 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -32,7 +32,7 @@ public:
     virtual void refreshVolumeLevels();
     virtual void showContextMenu();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     bool justHidden();
 
 protected:
diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index 1aba7fcf..72bae125 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -126,23 +126,23 @@ TQWidget* ViewGrid::add(MixDevice *md)
   return mdw;
 }
 
-TQSize ViewGrid::tqsizeHint() const {
-    //    kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
-    return( m_tqsizeHint);
+TQSize ViewGrid::sizeHint() const {
+    //    kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+    return( m_sizeHint);
 }
 
 void ViewGrid::constructionFinished() {
     //_layoutMDW->activate();
 
-    // do a manual tqlayout
+    // do a manual layout
     configurationUpdate();
 }
 
 void ViewGrid::refreshVolumeLevels() {
     //     kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n";
 
-   m_tqsizeHint.setWidth (0);
-   m_tqsizeHint.setHeight(0);
+   m_sizeHint.setWidth (0);
+   m_sizeHint.setHeight(0);
 
    m_testingX = 0;
    m_testingY = 0;
@@ -178,12 +178,12 @@ void ViewGrid::refreshVolumeLevels() {
 }
 
 /**
-   This implementation makes sure the Grid's tqgeometry is updated
+   This implementation makes sure the Grid's geometry is updated
    after hiding/showing channels.
 */
 void ViewGrid::configurationUpdate() {
-    m_tqsizeHint.setWidth (0);
-    m_tqsizeHint.setHeight(0);
+    m_sizeHint.setWidth (0);
+    m_sizeHint.setHeight(0);
 
     m_testingX = 0;
     m_testingY = 0;
@@ -195,9 +195,9 @@ void ViewGrid::configurationUpdate() {
       int xPos = m_testingX * m_spacingHorizontal;
       int yPos = m_testingY * m_spacingVertical ;
       mdw->move( xPos, yPos );
-      mdw->resize( mdw->tqsizeHint() );
-      int xMax = xPos + mdw->width() ; if ( xMax > m_tqsizeHint.width()  ) m_tqsizeHint.setWidth(xMax);
-      int yMax = yPos + mdw->height(); if ( yMax > m_tqsizeHint.height() ) m_tqsizeHint.setHeight(yMax);
+      mdw->resize( mdw->sizeHint() );
+      int xMax = xPos + mdw->width() ; if ( xMax > m_sizeHint.width()  ) m_sizeHint.setWidth(xMax);
+      int yMax = yPos + mdw->height(); if ( yMax > m_sizeHint.height() ) m_sizeHint.setHeight(yMax);
 
       m_testingX += 5;
       if ( m_testingX > 50 ) {
diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h
index 5fd1a183..48592a55 100644
--- a/kmix/viewgrid.h
+++ b/kmix/viewgrid.h
@@ -23,7 +23,7 @@ public:
     virtual void configurationUpdate();
     virtual void constructionFinished();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
@@ -33,7 +33,7 @@ private:
     unsigned int m_spacingVertical;
 
     // m_maxX and m_maxY are the highest coordiantes encountered
-    TQSize m_tqsizeHint;
+    TQSize m_sizeHint;
     
     unsigned int m_testingX;
     unsigned int m_testingY;
diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp
index 3cab3c6d..af0e7cb3 100644
--- a/kmix/viewsliders.cpp
+++ b/kmix/viewsliders.cpp
@@ -22,7 +22,7 @@
 #include "viewsliders.h"
 
 // TQt
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 // KDE
@@ -102,9 +102,9 @@ TQWidget* ViewSliders::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSliders::tqsizeHint() const {
-    //    kdDebug(67100) << "ViewSliders::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
-    return( _layoutMDW->tqsizeHint() );
+TQSize ViewSliders::sizeHint() const {
+    //    kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+    return( _layoutMDW->sizeHint() );
 }
 
 void ViewSliders::constructionFinished() {
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index 168a425c..31e3fda9 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -21,7 +21,7 @@ public:
     virtual TQWidget* add(MixDevice *mdw);
     virtual void constructionFinished();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp
index 5b2ac99f..6a810c94 100644
--- a/kmix/viewsurround.cpp
+++ b/kmix/viewsurround.cpp
@@ -23,7 +23,7 @@
 
 // TQt
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 // KDE
@@ -154,7 +154,7 @@ TQWidget* ViewSurround::add(MixDevice *md)
     case MixDevice::SURROUND:
     case MixDevice::AC97:
     default:
-	// Add as slider to the tqlayout on the left side
+	// Add as slider to the layout on the left side
 	_layoutSliders->add(mdw);
 	break;
     } // switch(type)
@@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSurround::tqsizeHint() const {
-    //    kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
-    return( _layoutMDW->tqsizeHint() );
+TQSize ViewSurround::sizeHint() const {
+    //    kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+    return( _layoutMDW->sizeHint() );
 }
 
 void ViewSurround::constructionFinished() {
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index de469292..4ba3c5cc 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -24,7 +24,7 @@ public:
     virtual TQWidget* add(MixDevice *mdw);
     virtual void constructionFinished();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 3d3166bb..607b3397 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -21,7 +21,7 @@
 
 #include "viewswitches.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 #include <kdebug.h>
@@ -46,7 +46,7 @@ ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString &
 	// Place enums right from the switches: This is done, so that there will be no
 	// ugly space on the left side, when no Switch is shown.
 	// Actually it is not really clear yet, why there is empty space at all: There are 0 items in
-	// the _layoutEnum, so it might be a tqsizeHint() or some other subtle tqlayout issue.
+	// the _layoutEnum, so it might be a sizeHint() or some other subtle layout issue.
 	_layoutEnum = new TQVBoxLayout(_layoutMDW);
     }
     init();
@@ -118,9 +118,9 @@ TQWidget* ViewSwitches::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSwitches::tqsizeHint() const {
-    //kdDebug(67100) << "ViewSwitches::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
-    return( _layoutMDW->tqsizeHint() );
+TQSize ViewSwitches::sizeHint() const {
+    //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
+    return( _layoutMDW->sizeHint() );
 }
 
 void ViewSwitches::constructionFinished() {
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index 9e591514..3ddb288f 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -22,7 +22,7 @@ public:
     virtual void constructionFinished();
     virtual void configurationUpdate();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();