Rename old tq methods that no longer need a unique name

5 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 90403b7..c861a41 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -182,7 +182,7 @@ AudioConfigurationPage::AudioConfigurationPage(
     ++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);
     ++row;
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 11b4c31..150688e 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -173,8 +173,8 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     TQString status(i18n("Unknown"));
     SequenceManager *mgr = doc->getSequenceManager();
     if (mgr) {
-        int drivertqStatus = mgr->getSoundDrivertqStatus() & (AUDIO_OK | MIDI_OK);
-        switch (drivertqStatus) {
+        int driverStatus = mgr->getSoundDriverStatus() & (AUDIO_OK | MIDI_OK);
+        switch (driverStatus) {
         case AUDIO_OK:
             status = i18n("No MIDI, audio OK");
             break;
@@ -195,7 +195,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
     TQPushButton *showStatusButton = new TQPushButton(i18n("Details..."),
                                     frame);
     TQObject::connect(showStatusButton, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotShowtqStatus()));
+                     this, TQT_SLOT(slotShowStatus()));
     tqlayout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
     ++row;
 
@@ -289,7 +289,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
 }
 
 void
-GeneralConfigurationPage::slotShowtqStatus()
+GeneralConfigurationPage::slotShowStatus()
 {
     ShowSequencerStatusDialog dialog(this);
     dialog.exec();
diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h
index 9dc7190..36ca725 100644
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@@ -85,7 +85,7 @@ signals:
     void updateSidebarStyle(unsigned int);
 
 protected slots:
-    void slotShowtqStatus();
+    void slotShowStatus();
 
 protected:
     int getCountInSpin()            { return m_countIn->value(); }
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index f853d1c..3263443 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -141,7 +141,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	}
 
 	// editHeader->setReadOnly( true );
-	editHeader->tqsetAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
+	editHeader->setAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
 
 	layoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
 
@@ -153,7 +153,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
 	shown.insert(key);
     }
     TQLabel *separator = new TQLabel(i18n("The composition comes here."), frameHeaders);
-    separator->tqsetAlignment( TQt::AlignCenter );
+    separator->setAlignment( TQt::AlignCenter );
     layoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
 
     //
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 4296773..7e31c28 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -481,11 +481,11 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
     subLayout->addWidget(typeLabel, 3, 0);
 
     m_fontOriginLabel = new TQLabel(subFrame);
-    m_fontOriginLabel->tqsetAlignment(TQt::WordBreak);
+    m_fontOriginLabel->setAlignment(TQt::WordBreak);
     m_fontOriginLabel->setFont(font);
 //    m_fontOriginLabel->setFixedWidth(250);
     m_fontCopyrightLabel = new TQLabel(subFrame);
-    m_fontCopyrightLabel->tqsetAlignment(TQt::WordBreak);
+    m_fontCopyrightLabel->setAlignment(TQt::WordBreak);
     m_fontCopyrightLabel->setFont(font);
 //    m_fontCopyrightLabel->setFixedWidth(250);
     m_fontMappedByLabel = new TQLabel(subFrame);