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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 37 insertions, 37 deletions

diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 92da20d..11b4c31 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -51,7 +51,7 @@
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 namespace Rosegarden
@@ -69,7 +69,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
     TQFrame *frame;
-    TQGridLayout *layout;
+    TQGridLayout *tqlayout;
     TQLabel *label = 0;
     int row = 0;
 
@@ -77,14 +77,14 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     // "Behavior" tab
     //
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame,
+    tqlayout = new TQGridLayout(frame,
                              6, 2,  // nbrow, nbcol
                              10, 5);
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Double-click opens segment in"),
+    tqlayout->addWidget(new TQLabel(i18n("Double-click opens segment in"),
                                  frame), row, 0);
 
     m_client = new KComboBox(frame);
@@ -93,20 +93,20 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_client->insertItem(i18n("Event List editor"));
     m_client->setCurrentItem(m_cfg->readUnsignedNumEntry("doubleclickclient", NotationView));
 
-    layout->addMultiCellWidget(m_client, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_client, row, row, 1, 2);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Number of count-in measures when recording"),
+    tqlayout->addWidget(new TQLabel(i18n("Number of count-in measures when recording"),
                                  frame), row, 0);
 
     m_countIn = new TQSpinBox(frame);
     m_countIn->setValue(m_cfg->readUnsignedNumEntry("countinbars", 0));
     m_countIn->setMaxValue(10);
     m_countIn->setMinValue(0);
-    layout->addMultiCellWidget(m_countIn, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_countIn, row, row, 1, 2);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Auto-save interval"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Auto-save interval"), frame), row, 0);
     
     m_autoSave = new KComboBox(frame);
     m_autoSave->insertItem(i18n("Every 30 seconds"));
@@ -129,7 +129,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
         m_autoSave->setCurrentItem(3);
     }
 
-    layout->addMultiCellWidget(m_autoSave, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_autoSave, row, row, 1, 2);
     ++row;
 
     // JACK Transport
@@ -138,10 +138,10 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
     label = new TQLabel(i18n("Use JACK transport"), frame);
-    layout->addWidget(label, row, 0);
+    tqlayout->addWidget(label, row, 0);
 
     m_jackTransport = new TQCheckBox(frame);
-    layout->addMultiCellWidget(m_jackTransport, row, row, 1, 2);
+    tqlayout->addMultiCellWidget(m_jackTransport, row, row, 1, 2);
 
 //    m_jackTransport->insertItem(i18n("Ignore JACK transport"));
 //    m_jackTransport->insertItem(i18n("Sync"));
@@ -165,16 +165,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 #endif
 
-    layout->setRowSpacing(row, 20);
+    tqlayout->setRowSpacing(row, 20);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Sequencer status"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Sequencer status"), frame), row, 0);
 
     TQString status(i18n("Unknown"));
     SequenceManager *mgr = doc->getSequenceManager();
     if (mgr) {
-        int driverStatus = mgr->getSoundDriverStatus() & (AUDIO_OK | MIDI_OK);
-        switch (driverStatus) {
+        int drivertqStatus = mgr->getSoundDrivertqStatus() & (AUDIO_OK | MIDI_OK);
+        switch (drivertqStatus) {
         case AUDIO_OK:
             status = i18n("No MIDI, audio OK");
             break;
@@ -190,16 +190,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
         }
     }
 
-    layout->addWidget(new TQLabel(status, frame), row, 1);
+    tqlayout->addWidget(new TQLabel(status, frame), row, 1);
 
     TQPushButton *showStatusButton = new TQPushButton(i18n("Details..."),
                                     frame);
     TQObject::connect(showStatusButton, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotShowStatus()));
-    layout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
+                     this, TQT_SLOT(slotShowtqStatus()));
+    tqlayout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
     ++row;
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Behavior"));
 
@@ -207,16 +207,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     // "Appearance" tab
     //
     frame = new TQFrame(m_tabWidget);
-    layout = new TQGridLayout(frame,
-                                          7, 4,  // nbrow, nbcol -- one extra row improves layout
+    tqlayout = new TQGridLayout(frame,
+                                          7, 4,  // nbrow, nbcol -- one extra row improves tqlayout
                                           10, 5);
 
     row = 0;
 
-    layout->setRowSpacing(row, 15);
+    tqlayout->setRowSpacing(row, 15);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Side-bar parameter box layout"),
+    tqlayout->addWidget(new TQLabel(i18n("Side-bar parameter box tqlayout"),
                                  frame), row, 0);
 
     m_sidebarStyle = new KComboBox(frame);
@@ -227,38 +227,38 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
 
     m_sidebarStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("sidebarstyle",
                                    0));
-    layout->addMultiCellWidget(m_sidebarStyle, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_sidebarStyle, row, row, 1, 3);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Note name style"),
+    tqlayout->addWidget(new TQLabel(i18n("Note name style"),
                                  frame), row, 0);
 
     m_nameStyle = new KComboBox(frame);
     m_nameStyle->insertItem(i18n("Always use US names (e.g. quarter, 8th)"));
     m_nameStyle->insertItem(i18n("Localized (where available)"));
     m_nameStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("notenamestyle", Local));
-    layout->addMultiCellWidget(m_nameStyle, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_nameStyle, row, row, 1, 3);
     ++row;
 /*
-    layout->addWidget(new TQLabel(i18n("Show tool context help in status bar"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Show tool context help in status bar"), frame), row, 0);
 
     m_toolContextHelp = new TQCheckBox(frame);
-    layout->addWidget(m_toolContextHelp, row, 1);
+    tqlayout->addWidget(m_toolContextHelp, row, 1);
     m_toolContextHelp->setChecked(m_cfg->readBoolEntry
                                   ("toolcontexthelp", true));
     ++row;
 */
 
-    layout->addWidget(new TQLabel(i18n("Show textured background on"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Show textured background on"), frame), row, 0);
 
     m_backgroundTextures = new TQCheckBox(i18n("Main window"), frame);
-    layout->addWidget(m_backgroundTextures, row, 1);
+    tqlayout->addWidget(m_backgroundTextures, row, 1);
 
     m_matrixBackgroundTextures = new TQCheckBox(i18n("Matrix"), frame);
-    layout->addWidget(m_matrixBackgroundTextures, row, 2);
+    tqlayout->addWidget(m_matrixBackgroundTextures, row, 2);
 
     m_notationBackgroundTextures = new TQCheckBox(i18n("Notation"), frame);
-    layout->addWidget(m_notationBackgroundTextures, row, 3);
+    tqlayout->addWidget(m_notationBackgroundTextures, row, 3);
 
     m_backgroundTextures->setChecked(m_cfg->readBoolEntry
                                      ("backgroundtextures", true));
@@ -272,24 +272,24 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     m_cfg->setGroup(GeneralOptionsConfigGroup);
     ++row;
 
-    layout->addWidget(new TQLabel(i18n("Use bundled Klearlook theme"), frame), row, 0);
+    tqlayout->addWidget(new TQLabel(i18n("Use bundled Klearlook theme"), frame), row, 0);
     m_globalStyle = new KComboBox(frame);
     m_globalStyle->insertItem(i18n("Never"));
     m_globalStyle->insertItem(i18n("When not running under KDE"));
     m_globalStyle->insertItem(i18n("Always"));
     m_globalStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("Install Own Theme", 1));
-    layout->addMultiCellWidget(m_globalStyle, row, row, 1, 3);
+    tqlayout->addMultiCellWidget(m_globalStyle, row, row, 1, 3);
 
     ++row;
 
-    layout->setRowStretch(row, 10);
+    tqlayout->setRowStretch(row, 10);
 
     addTab(frame, i18n("Presentation"));
 
 }
 
 void
-GeneralConfigurationPage::slotShowStatus()
+GeneralConfigurationPage::slotShowtqStatus()
 {
     ShowSequencerStatusDialog dialog(this);
     dialog.exec();