Rename obsolete tq methods to standard names

4 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index fa5a1a3..24a35c9 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -1714,7 +1714,7 @@ AudioMixerWindow::slotToggleUnassignedFaders()
 void
 AudioMixerWindow::toggleNamedWidgets(bool show, const char* const name)
 {
-    TQLayoutIterator it = m_mainBox->tqlayout()->iterator();
+    TQLayoutIterator it = m_mainBox->layout()->iterator();
     TQLayoutItem *child;
     while ( (child = it.current()) != 0 ) {
         TQWidget * widget = child->widget();
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index fa88568..eb2ae52 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -102,18 +102,18 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
 
     btnBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
+    TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
 
     m_closeButton = new TQPushButton(btnBox);
     m_applyButton = new TQPushButton(i18n("Apply"), btnBox);
     m_resetButton = new TQPushButton(i18n("Reset"), btnBox);
 
-    tqlayout->addStretch(10);
-    tqlayout->addWidget(m_applyButton);
-    tqlayout->addWidget(m_resetButton);
-    tqlayout->addSpacing(15);
-    tqlayout->addWidget(m_closeButton);
-    tqlayout->addSpacing(5);
+    layout->addStretch(10);
+    layout->addWidget(m_applyButton);
+    layout->addWidget(m_resetButton);
+    layout->addSpacing(15);
+    layout->addWidget(m_closeButton);
+    layout->addSpacing(5);
 
     connect(m_applyButton, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotApply()));
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 6a8ef2f..d426994 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -110,7 +110,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_playTable->setSelectionMode(TQTable::SingleRow);
 
         TQFrame *frame = new TQFrame(groupBox);
-        TQVBoxLayout *vtqlayout = new TQVBoxLayout(frame);
+        TQVBoxLayout *vlayout = new TQVBoxLayout(frame);
         TQGrid *buttons = new TQGrid(2, Qt::Horizontal, frame);
         TQPushButton *addButton = new TQPushButton(i18n("New"), buttons);
         m_deletePlayButton = new TQPushButton(i18n("Delete"), buttons);
@@ -118,8 +118,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_exportButton = new TQPushButton(i18n("Export..."), buttons);
         m_banksButton = new TQPushButton(i18n("Banks..."), buttons);
         m_controllersButton = new TQPushButton(i18n("Control Events..."), buttons);
-        vtqlayout->addWidget(buttons);
-        vtqlayout->addStretch(10);
+        vlayout->addWidget(buttons);
+        vlayout->addStretch(10);
 
         TQToolTip::add
             (addButton,
@@ -169,12 +169,12 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         m_recordTable->setSelectionMode(TQTable::SingleRow);
 
         frame = new TQFrame(groupBox);
-        vtqlayout = new TQVBoxLayout(frame);
+        vlayout = new TQVBoxLayout(frame);
         buttons = new TQGrid(2, Qt::Horizontal, frame);
         addButton = new TQPushButton(i18n("New"), buttons);
         m_deleteRecordButton = new TQPushButton(i18n("Delete"), buttons);
-        vtqlayout->addWidget(buttons);
-        vtqlayout->addStretch(10);
+        vlayout->addWidget(buttons);
+        vlayout->addStretch(10);
 
         TQToolTip::add
             (addButton,
@@ -209,10 +209,10 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
         TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
 
-        TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
-        tqlayout->addStretch(10);
-        tqlayout->addWidget(closeButton);
-        tqlayout->addSpacing(5);
+        TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
+        layout->addStretch(10);
+        layout->addWidget(closeButton);
+        layout->addSpacing(5);
 
         KAction* close = KStdAction::close(TQT_TQOBJECT(this),
                                            TQT_SLOT(slotClose()),
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index 12e0716..4fdb00f 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -166,10 +166,10 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
 
         TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
 
-        TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
-        tqlayout->addStretch(10);
-        tqlayout->addWidget(closeButton);
-        tqlayout->addSpacing(5);
+        TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
+        layout->addStretch(10);
+        layout->addWidget(closeButton);
+        layout->addSpacing(5);
 
         KAction* close = KStdAction::close(TQT_TQOBJECT(this),
                                            TQT_SLOT(slotClose()),