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

1 files changed, 27 insertions, 27 deletions

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 90403b7..8c34193 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -50,7 +50,7 @@
 #include <tqlineedit.h>
 #include <tqobject.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
 #include <tqstring.h>
@@ -78,7 +78,7 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
     TQFrame *frame = new TQFrame(m_tabWidget);
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 2, 10, 5);
+    TQGridLayout *layout = new TQGridLayout(frame, 7, 2, 10, 5);
 
     TQLabel *label = 0;
 
@@ -86,17 +86,17 @@ AudioConfigurationPage::AudioConfigurationPage(
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("Audio preview scale"),
+    layout->addWidget(new TQLabel(i18n("Audio preview scale"),
                                  frame), row, 0);
 
     m_previewStyle = new KComboBox(frame);
     m_previewStyle->insertItem(i18n("Linear - easier to see loud peaks"));
     m_previewStyle->insertItem(i18n("Meter scaling - easier to see quiet activity"));
     m_previewStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("audiopreviewstyle", 1));
-    tqlayout->addMultiCellWidget(m_previewStyle, row, row, 1, 2);
+    layout->addMultiCellWidget(m_previewStyle, row, row, 1, 2);
     ++row;
 
 #ifdef HAVE_LIBJACK
@@ -107,14 +107,14 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_audioRecFormat->insertItem(i18n("16-bit PCM WAV format (smaller files)"));
     m_audioRecFormat->insertItem(i18n("32-bit float WAV format (higher quality)"));
     m_audioRecFormat->setCurrentItem(m_cfg->readUnsignedNumEntry("audiorecordfileformat", 1));
-    tqlayout->addWidget(label, row, 0);
-    tqlayout->addMultiCellWidget(m_audioRecFormat, row, row, 1, 2);
+    layout->addWidget(label, row, 0);
+    layout->addMultiCellWidget(m_audioRecFormat, row, row, 1, 2);
     ++row;
 #endif
 
     m_cfg->setGroup(GeneralOptionsConfigGroup);
 
-    tqlayout->addWidget(new TQLabel(i18n("External audio editor"), frame),
+    layout->addWidget(new TQLabel(i18n("External audio editor"), frame),
                       row, 0);
 
     TQString defaultAudioEditor = getBestAvailableAudioEditor();
@@ -131,18 +131,18 @@ AudioConfigurationPage::AudioConfigurationPage(
 
     m_externalAudioEditorPath = new TQLineEdit(externalAudioEditor, frame);
 //    m_externalAudioEditorPath->setMinimumWidth(150);
-    tqlayout->addWidget(m_externalAudioEditorPath, row, 1);
+    layout->addWidget(m_externalAudioEditorPath, row, 1);
     
     TQPushButton *changePathButton =
         new TQPushButton(i18n("Choose..."), frame);
 
-    tqlayout->addWidget(changePathButton, row, 2);
+    layout->addWidget(changePathButton, row, 2);
     connect(changePathButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFileDialog()));
     ++row;
 
     m_cfg->setGroup(SequencerOptionsConfigGroup);
 
-    tqlayout->addWidget(new TQLabel(i18n("Create JACK outputs"), frame),
+    layout->addWidget(new TQLabel(i18n("Create JACK outputs"), frame),
                       row, 0);
 //    ++row;
 
@@ -150,20 +150,20 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_createFaderOuts = new TQCheckBox(i18n("for individual audio instruments"), frame);
     m_createFaderOuts->setChecked(m_cfg->readBoolEntry("audiofaderouts", false));
 
-//    tqlayout->addWidget(label, row, 0, TQt::AlignRight);
-    tqlayout->addWidget(m_createFaderOuts, row, 1);
+//    layout->addWidget(label, row, 0, TQt::AlignRight);
+    layout->addWidget(m_createFaderOuts, row, 1);
     ++row;
 
     m_createSubmasterOuts = new TQCheckBox(i18n("for submasters"), frame);
     m_createSubmasterOuts->setChecked(m_cfg->readBoolEntry("audiosubmasterouts",
                                       false));
 
-//    tqlayout->addWidget(label, row, 0, TQt::AlignRight);
-    tqlayout->addWidget(m_createSubmasterOuts, row, 1);
+//    layout->addWidget(label, row, 0, TQt::AlignRight);
+    layout->addWidget(m_createSubmasterOuts, row, 1);
     ++row;
 #endif
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("General"));
 
@@ -174,17 +174,17 @@ AudioConfigurationPage::AudioConfigurationPage(
 #ifdef OFFER_JACK_START_OPTION
 
     frame = new TQFrame(m_tabWidget);
-    tqlayout = new TQGridLayout(frame, 8, 4, 10, 5);
+    layout = new TQGridLayout(frame, 8, 4, 10, 5);
 
     row = 0;
 
-    tqlayout->setRowSpacing(row, 15);
+    layout->setRowSpacing(row, 15);
     ++row;
 
     label = new TQLabel(i18n("Rosegarden can start the JACK audio daemon (jackd) for you automatically if it isn't already running when Rosegarden starts.\n\nThis is recommended for beginners and those who use Rosegarden as their main audio application, but it might not be to the liking of advanced users.\n\nIf you want to start JACK automatically, make sure the command includes a full path where necessary as well as any command-line arguments you want to use.\n\nFor example: /usr/local/bin/jackd -d alsa -d hw -r44100 -p 2048 -n 2\n\n"), frame);
-    label->tqsetAlignment(TQt::WordBreak);
+    label->setAlignment(TQt::WordBreak);
 
-    tqlayout->addMultiCellWidget(label, row, row, 0, 3);
+    layout->addMultiCellWidget(label, row, row, 0, 3);
     ++row;
 
     // JACK control things
@@ -193,12 +193,12 @@ AudioConfigurationPage::AudioConfigurationPage(
     m_startJack = new TQCheckBox(frame);
     m_startJack->setChecked(startJack);
 
-    tqlayout->addWidget(new TQLabel(i18n("Start JACK when Rosegarden starts"), frame), 2, 0);
+    layout->addWidget(new TQLabel(i18n("Start JACK when Rosegarden starts"), frame), 2, 0);
 
-    tqlayout->addWidget(m_startJack, row, 1);
+    layout->addWidget(m_startJack, row, 1);
     ++row;
 
-    tqlayout->addWidget(new TQLabel(i18n("JACK command"), frame),
+    layout->addWidget(new TQLabel(i18n("JACK command"), frame),
                       row, 0);
 
     TQString jackPath = m_cfg->readEntry("jackcommand",
@@ -206,10 +206,10 @@ AudioConfigurationPage::AudioConfigurationPage(
                                         "/usr/bin/qjackctl -s");
     m_jackPath = new TQLineEdit(jackPath, frame);
 
-    tqlayout->addMultiCellWidget(m_jackPath, row, row, 1, 3);
+    layout->addMultiCellWidget(m_jackPath, row, row, 1, 3);
     ++row;
 
-    tqlayout->setRowStretch(row, 10);
+    layout->setRowStretch(row, 10);
 
     addTab(frame, i18n("JACK Startup"));
 
@@ -259,7 +259,7 @@ AudioConfigurationPage::apply()
     if (extpath != "") {
         TQFileInfo info(extpath);
         if (!info.exists() || !info.isExecutable()) {
-            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").tqarg(extpath));
+            KMessageBox::error(0, i18n("External audio editor \"%1\" not found or not executable").arg(extpath));
             m_cfg->writeEntry("externalaudioeditor", "");
         } else {
             m_cfg->writeEntry("externalaudioeditor", externalAudioEditor);
@@ -306,7 +306,7 @@ AudioConfigurationPage::getBestAvailableAudioEditor()
 
             if (fi.exists() && fi.isExecutable()) {
                 if (n == "rezound") {
-                    result = TQString("%1 --audio-method=jack").tqarg(fp);
+                    result = TQString("%1 --audio-method=jack").arg(fp);
                 } else {
                     result = fp;
                 }