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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

1 files changed, 13 insertions, 13 deletions

diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index 7bcc1d70..3cfa42e5 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout( m_generalTab );
-   layout->setSpacing( KDialog::spacingHint() );
+   TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab );
+   tqlayout->setSpacing( KDialog::spacingHint() );
 
    m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab );
-   layout->addWidget( m_dockingChk );
+   tqlayout->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);
-   layout->addWidget(m_volumeChk);
+   tqlayout->addWidget(m_volumeChk);
 
    m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab );
-   layout->addWidget( m_showTicks );
+   tqlayout->addWidget( m_showTicks );
    TQWhatsThis::add(m_showTicks,
            i18n("Enable/disable tickmark scales on the sliders"));
 
    m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab );
-   layout->addWidget( m_showLabels );
+   tqlayout->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 );
-   layout->addWidget( m_onLogin );
+   tqlayout->addWidget( m_onLogin );
 
    m_dockIconMuting = new TQCheckBox( 
             i18n("Middle click on system tray icon toggles muting"), m_generalTab );
-   layout->addWidget( m_dockIconMuting );
+   tqlayout->addWidget( m_dockIconMuting );
 
-   TQBoxLayout *numbersLayout = new TQHBoxLayout( layout );
+   TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout );
    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 );
-   layout->addWidget( m_autoStartChk );
+   tqlayout->addWidget( m_autoStartChk );
    TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login"));
 
-   TQBoxLayout *orientationLayout = new TQHBoxLayout( layout );
+   TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout );
    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();
-   layout->addStretch();
+   tqlayout->addStretch();
    enableButtonSeparator(true);
 
    connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) );