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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 34 insertions, 34 deletions

diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index d161fb0..44c4c49 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -50,7 +50,7 @@
 #include <tqlineedit.h>
 #include <tqobject.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
 #include <tqstring.h>
@@ -78,38 +78,38 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     // ---------------- General tab ------------------
     //
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *layout = new TQGridLayout(frame, 9, 4, 10, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 9, 4, 10, 5);
 
     int row = 0;
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
     TQLabel *label = 0;
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    layout->addMultiCellWidget(new TQLabel(i18n("Base octave number for MIDI pitch display"),
+    tqlayout->addMultiCellWidget(new TQLabel(i18n("Base octave number for MIDI pitch display"),
 					  frame), row, row, 0, 1);
     
     m_midiPitchOctave = new TQSpinBox(frame);
     m_midiPitchOctave->setMaxValue(10);
     m_midiPitchOctave->setMinValue( -10);
     m_midiPitchOctave->setValue(m_cfg->readNumEntry("midipitchoctave", -2));
-    layout->addMultiCellWidget(m_midiPitchOctave, row, row, 2, 3);
+    tqlayout->addMultiCellWidget(m_midiPitchOctave, row, row, 2, 3);
     ++row;
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    layout->addMultiCellWidget(new TQLabel(i18n("Always use default studio when loading files"),
+    tqlayout->addMultiCellWidget(new TQLabel(i18n("Always use default studio when loading files"),
 					  frame), row, row, 0, 1);
 
     m_studio = new TQCheckBox(frame);
     m_studio->setChecked(m_cfg->readBoolEntry("alwaysusedefaultstudio", false));
-    layout->addWidget(m_studio, row, 2);
+    tqlayout->addWidget(m_studio, row, 2);
     ++row;
 
     // Send Controllers
@@ -121,14 +121,14 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     TQString controllerTip = i18n("Rosegarden can send all MIDI Controllers (Pan, Reverb etc) to all MIDI devices every\ntime you hit play if you so wish.  Please note that this option will usually incur a\ndelay at the start of playback due to the amount of data being transmitted.");
     TQToolTip::add
         (label, controllerTip);
-    layout->addMultiCellWidget(label, row, row, 0, 1);
+    tqlayout->addMultiCellWidget(label, row, row, 0, 1);
 
     m_sendControllersAtPlay = new TQCheckBox(frame);
     bool sendControllers = m_cfg->readBoolEntry("alwayssendcontrollers", false);
     m_sendControllersAtPlay->setChecked(sendControllers);
     TQToolTip::add
         (m_sendControllersAtPlay, controllerTip);
-    layout->addWidget(m_sendControllersAtPlay, row, 2);
+    tqlayout->addWidget(m_sendControllersAtPlay, row, 2);
     ++row;
 
     // Timer selection
@@ -136,10 +136,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
     label = new TQLabel(i18n("Sequencer timing source"), frame);
-    layout->addMultiCellWidget(label, row, row, 0, 1);
+    tqlayout->addMultiCellWidget(label, row, row, 0, 1);
 
     m_timer = new KComboBox(frame);
-    layout->addMultiCellWidget(m_timer, row, row, 2, 3);
+    tqlayout->addMultiCellWidget(m_timer, row, row, 2, 3);
 
     TQStringList timers = m_doc->getTimers();
     m_origTimer = m_doc->getCurrentTimer();
@@ -153,7 +153,7 @@ MIDIConfigurationPage::MIDIConfigurationPage(
 
     ++row;
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
     m_cfg->setGroup(SequencerOptionsConfigGroup);
@@ -163,25 +163,25 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     TQLabel* lbl = new TQLabel(i18n("Load SoundFont to SoundBlaster card at startup"), frame);
     TQString tooltip = i18n("Check this box to enable soundfont loading on EMU10K-based cards when Rosegarden is launched");
     TQToolTip::add(lbl, tooltip);
-    layout->addMultiCellWidget(lbl, row, row, 0, 1);
+    tqlayout->addMultiCellWidget(lbl, row, row, 0, 1);
 
     m_sfxLoadEnabled = new TQCheckBox(frame);
-    layout->addWidget(m_sfxLoadEnabled, row, 2);
+    tqlayout->addWidget(m_sfxLoadEnabled, row, 2);
     TQToolTip::add(m_sfxLoadEnabled, tooltip);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Path to 'asfxload' or 'sfxload' command"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Path to 'asfxload' or 'sfxload' command"), frame), row, 0);
     m_sfxLoadPath = new TQLineEdit(m_cfg->readEntry("sfxloadpath", "/bin/sfxload"), frame);
-    layout->addMultiCellWidget(m_sfxLoadPath, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_sfxLoadPath, row, row, 1, 2);
     m_sfxLoadChoose = new TQPushButton("Choose...", frame);
-    layout->addWidget(m_sfxLoadChoose, row, 3);
+    tqlayout->addWidget(m_sfxLoadChoose, row, 3);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("SoundFont"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("SoundFont"), frame), row, 0);
     m_soundFontPath = new TQLineEdit(m_cfg->readEntry("soundfontpath", ""), frame);
-    layout->addMultiCellWidget(m_soundFontPath, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_soundFontPath, row, row, 1, 2);
     m_soundFontChoose = new TQPushButton("Choose...", frame);
-    layout->addWidget(m_soundFontChoose, row, 3);
+    tqlayout->addWidget(m_soundFontChoose, row, 3);
     ++row;
 
     bool sfxLoadEnabled = m_cfg->readBoolEntry("sfxloadenabled", false);
@@ -202,7 +202,7 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     connect(m_soundFontChoose, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotSoundFontChoose()));
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
     addTab(frame, i18n("General"));
 
@@ -211,19 +211,19 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     //  -------------- Synchronisation tab -----------------
     //
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame, 7, 2, 10, 5);
+    tqlayout = new TQGridLayout(frame, 7, 2, 10, 5);
 
     row = 0;
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
     // MIDI Clock and System Realtime Messages
     //
     label = new TQLabel(i18n("MIDI Clock and System messages"), frame);
-    layout->addWidget(label, row, 0);
+    tqlayout->addWidget(label, row, 0);
     m_midiSync = new KComboBox(frame);
-    layout->addWidget(m_midiSync, row, 1);
+    tqlayout->addWidget(m_midiSync, row, 1);
 
     m_midiSync->insertItem(i18n("Off"));
     m_midiSync->insertItem(i18n("Send MIDI Clock, Start and Stop"));
@@ -239,10 +239,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     // MMC Transport
     //
     label = new TQLabel(i18n("MIDI Machine Control mode"), frame);
-    layout->addWidget(label, row, 0);
+    tqlayout->addWidget(label, row, 0);
 
     m_mmcTransport = new KComboBox(frame);
-    layout->addWidget(m_mmcTransport, row, 1); //, TQt::AlignHCenter);
+    tqlayout->addWidget(m_mmcTransport, row, 1); //, TQt::AlignHCenter);
 
     m_mmcTransport->insertItem(i18n("Off"));
     m_mmcTransport->insertItem(i18n("MMC Master"));
@@ -258,10 +258,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
     // MTC transport
     //
     label = new TQLabel(i18n("MIDI Time Code mode"), frame);
-    layout->addWidget(label, row, 0);
+    tqlayout->addWidget(label, row, 0);
 
     m_mtcTransport = new KComboBox(frame);
-    layout->addWidget(m_mtcTransport, row, 1);
+    tqlayout->addWidget(m_mtcTransport, row, 1);
 
     m_mtcTransport->insertItem(i18n("Off"));
     m_mtcTransport->insertItem(i18n("MTC Master"));
@@ -276,18 +276,18 @@ MIDIConfigurationPage::MIDIConfigurationPage(
 
     TQHBox *hbox = new TQHBox(frame);
     hbox->setSpacing(5);
-    layout->addMultiCellWidget(hbox, row, row, 0, 1);
+    tqlayout->addMultiCellWidget(hbox, row, row, 0, 1);
 
     label = new TQLabel(i18n("Automatically connect sync output to all devices in use"), hbox);
-//    layout->addWidget(label, row, 0);
+//    tqlayout->addWidget(label, row, 0);
     m_midiSyncAuto = new TQCheckBox(hbox);
-//    layout->addWidget(m_midiSyncAuto, row, 1);
+//    tqlayout->addWidget(m_midiSyncAuto, row, 1);
 
     m_midiSyncAuto->setChecked(m_cfg->readBoolEntry("midisyncautoconnect", false));
 
     ++row;
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
     addTab(frame, i18n("MIDI Sync"));
 }