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/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index 4410308..a1929aa 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -24,7 +24,7 @@
 
 
 #include "LatencyConfigurationPage.h"
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "document/ConfigGroups.h"
 #include "ConfigurationPage.h"
@@ -56,19 +56,19 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 #ifdef HAVE_LIBJACK
 
     frame = new TQFrame(m_tabWidget, i18n("JACK latency"));
-    layout = new TQGridLayout(frame, 6, 5, 10, 10);
+    tqlayout = new TQGridLayout(frame, 6, 5, 10, 10);
 
-    layout->addMultiCellWidget(new TQLabel(i18n("Use the \"Fetch JACK latencies\" button to discover the latency values set at\nthe sequencer.  It's recommended that you use the returned values but it's also\npossible to override them manually using the sliders.  Note that if you change\nyour JACK server parameters you should always fetch the latency values again.\nThe latency values will be stored by Rosegarden for use next time."), frame),
+    tqlayout->addMultiCellWidget(new TQLabel(i18n("Use the \"Fetch JACK latencies\" button to discover the latency values set at\nthe sequencer.  It's recommended that you use the returned values but it's also\npossible to override them manually using the sliders.  Note that if you change\nyour JACK server parameters you should always fetch the latency values again.\nThe latency values will be stored by Rosegarden for use next time."), frame),
                                0, 0,
                                0, 3);
 
-    layout->addWidget(new TQLabel(i18n("JACK playback latency (in ms)"), frame), 1, 0);
-    layout->addWidget(new TQLabel(i18n("JACK record latency (in ms)"), frame), 3, 0);
+    tqlayout->addWidget(new TQLabel(i18n("JACK playback latency (in ms)"), frame), 1, 0);
+    tqlayout->addWidget(new TQLabel(i18n("JACK record latency (in ms)"), frame), 3, 0);
 
     m_fetchLatencyValues = new TQPushButton(i18n("Fetch JACK latencies"),
                                            frame);
 
-    layout->addWidget(m_fetchLatencyValues, 1, 3);
+    tqlayout->addWidget(m_fetchLatencyValues, 1, 3);
 
     connect(m_fetchLatencyValues, TQT_SIGNAL(released()),
             TQT_SLOT(slotFetchLatencyValues()));
@@ -80,19 +80,19 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 
     m_jackPlayback = new TQSlider(Horizontal, frame);
     m_jackPlayback->setTickmarks(TQSlider::Below);
-    layout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
+    tqlayout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
 
-    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
+    TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").tqarg(jackPlaybackValue),
                                            frame);
-    layout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
+    tqlayout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
     connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
             jackPlaybackLabel, TQT_SLOT(setNum(int)));
 
     m_jackPlayback->setMinValue(0);
-    layout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
+    tqlayout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
 
     m_jackPlayback->setMaxValue(500);
-    layout->addWidget(new TQLabel("500", frame), 3, 4, TQt::AlignLeft);
+    tqlayout->addWidget(new TQLabel("500", frame), 3, 4, TQt::AlignLeft);
 
     m_jackPlayback->setValue(jackPlaybackValue);
 
@@ -103,20 +103,20 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 
     m_jackRecord = new TQSlider(Horizontal, frame);
     m_jackRecord->setTickmarks(TQSlider::Below);
-    layout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
+    tqlayout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
 
-    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
+    TQLabel *jackRecordLabel = new TQLabel(TQString("%1").tqarg(jackRecordValue),
                                          frame);
-    layout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
+    tqlayout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
     connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),
             jackRecordLabel, TQT_SLOT(setNum(int)));
 
     m_jackRecord->setMinValue(0);
-    layout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
+    tqlayout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
 
     m_jackRecord->setMaxValue(500);
     m_jackRecord->setValue(jackRecordValue);
-    layout->addWidget(new TQLabel("500", frame), 5, 4, TQt::AlignLeft);
+    tqlayout->addWidget(new TQLabel("500", frame), 5, 4, TQt::AlignLeft);
 
     addTab(frame, i18n("JACK Latency"));
 #endif  // HAVE_LIBJACK