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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 7c3105b..158cd07 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ManageMetronomeDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
@@ -77,11 +77,11 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
                            (1, Qt::Horizontal, i18n("Metronome Instrument"), vbox);
 
     TQFrame *frame = new TQFrame(deviceBox);
-    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
 
-    layout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
     m_metronomeDevice = new KComboBox(frame);
-    layout->addWidget(m_metronomeDevice, 0, 1);
+    tqlayout->addWidget(m_metronomeDevice, 0, 1);
 
     DeviceList *devices = doc->getStudio().getDevices();
     DeviceListConstIterator it;
@@ -108,47 +108,47 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
         }
     }
 
-    layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
     m_metronomeInstrument = new KComboBox(frame);
     connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified()));
     connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int)));
-    layout->addWidget(m_metronomeInstrument, 1, 1);
+    tqlayout->addWidget(m_metronomeInstrument, 1, 1);
 
     TQGroupBox *beatBox = new TQGroupBox
                          (1, Qt::Horizontal, i18n("Beats"), vbox);
 
     frame = new TQFrame(beatBox);
-    layout = new TQGridLayout(frame, 4, 2, 10, 5);
+    tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
 
-    layout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
     m_metronomeResolution = new KComboBox(frame);
     m_metronomeResolution->insertItem(i18n("None"));
     m_metronomeResolution->insertItem(i18n("Bars only"));
     m_metronomeResolution->insertItem(i18n("Bars and beats"));
     m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions"));
     connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int)));
-    layout->addWidget(m_metronomeResolution, 0, 1);
+    tqlayout->addWidget(m_metronomeResolution, 0, 1);
 
-    layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
     m_metronomeBarVely = new TQSpinBox(frame);
     m_metronomeBarVely->setMinValue(0);
     m_metronomeBarVely->setMaxValue(127);
     connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    layout->addWidget(m_metronomeBarVely, 1, 1);
+    tqlayout->addWidget(m_metronomeBarVely, 1, 1);
 
-    layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
     m_metronomeBeatVely = new TQSpinBox(frame);
     m_metronomeBeatVely->setMinValue(0);
     m_metronomeBeatVely->setMaxValue(127);
     connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    layout->addWidget(m_metronomeBeatVely, 2, 1);
+    tqlayout->addWidget(m_metronomeBeatVely, 2, 1);
 
-    layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
     m_metronomeSubBeatVely = new TQSpinBox(frame);
     m_metronomeSubBeatVely->setMinValue(0);
     m_metronomeSubBeatVely->setMaxValue(127);
     connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
-    layout->addWidget(m_metronomeSubBeatVely, 3, 1);
+    tqlayout->addWidget(m_metronomeSubBeatVely, 3, 1);
 
     vbox = new TQVBox(hbox);
 
@@ -261,7 +261,7 @@ ManageMetronomeDialog::populate(int deviceIndex)
                 }
             }
 
-            //	    if (used) iname = i18n("%1 [used]").arg(iname);
+            //	    if (used) iname = i18n("%1 [used]").tqarg(iname);
 
             m_metronomeInstrument->insertItem(iname);