Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 42 insertions, 42 deletions

diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp
index 516aaf9..2cedab8 100644
--- a/src/gui/configuration/AudioConfigurationPage.cpp
+++ b/src/gui/configuration/AudioConfigurationPage.cpp
@@ -135,7 +135,7 @@ AudioConfigurationPage::AudioConfigurationPage(
         new TQPushButton(i18n("Choose..."), frame);
 
     layout->addWidget(changePathButton, row, 2);
-    connect(changePathButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFileDialog()));
+    connect(changePathButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotFileDialog()));
     ++row;
 
     m_cfg->setGroup(SequencerOptionsConfigGroup);
diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp
index ac2849d..29bfdb4 100644
--- a/src/gui/configuration/AudioPropertiesPage.cpp
+++ b/src/gui/configuration/AudioPropertiesPage.cpp
@@ -82,8 +82,8 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
 
     calculateStats();
 
-    connect(m_changePathButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotFileDialog()));
+    connect(m_changePathButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotFileDialog()));
 
     addTab(frame, i18n("Modify audio path"));
 }
@@ -95,9 +95,9 @@ AudioPropertiesPage::calculateStats()
     //
     TQString mountPoint = TDEIO::findPathMountPoint(m_path->text());
     KDiskFreeSp * job = new KDiskFreeSp;
-    connect(job, TQT_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long,
+    connect(job, TQ_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long,
                                         unsigned long)),
-            this, TQT_SLOT(slotFoundMountPoint(const TQString&, unsigned long, unsigned long,
+            this, TQ_SLOT(slotFoundMountPoint(const TQString&, unsigned long, unsigned long,
                                            unsigned long)));
     job->readDF(mountPoint);
 }
@@ -153,11 +153,11 @@ AudioPropertiesPage::slotFileDialog()
                               this, "file dialog", true);
     fileDialog->setMode(KFile::Directory);
 
-    connect(fileDialog, TQT_SIGNAL(fileSelected(const TQString&)),
-            TQT_SLOT(slotFileSelected(const TQString&)));
+    connect(fileDialog, TQ_SIGNAL(fileSelected(const TQString&)),
+            TQ_SLOT(slotFileSelected(const TQString&)));
 
-    connect(fileDialog, TQT_SIGNAL(destroyed()),
-            TQT_SLOT(slotDirectoryDialogClosed()));
+    connect(fileDialog, TQ_SIGNAL(destroyed()),
+            TQ_SLOT(slotDirectoryDialogClosed()));
 
     if (fileDialog->exec() == TQDialog::Accepted) {
         m_path->setText(fileDialog->selectedFile());
diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp
index 8a7101e..7903b7c 100644
--- a/src/gui/configuration/ColourConfigurationPage.cpp
+++ b/src/gui/configuration/ColourConfigurationPage.cpp
@@ -73,20 +73,20 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
                                       frame);
     layout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
 
-    connect(addColourButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotAddNew()));
+    connect(addColourButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotAddNew()));
 
-    connect(deleteColourButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotDelete()));
+    connect(deleteColourButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotDelete()));
 
-    connect(this, TQT_SIGNAL(docColoursChanged()),
-            m_doc, TQT_SLOT(slotDocColoursChanged()));
+    connect(this, TQ_SIGNAL(docColoursChanged()),
+            m_doc, TQ_SLOT(slotDocColoursChanged()));
 
-    connect(m_colourtable, TQT_SIGNAL(entryTextChanged(unsigned int, TQString)),
-            this, TQT_SLOT(slotTextChanged(unsigned int, TQString)));
+    connect(m_colourtable, TQ_SIGNAL(entryTextChanged(unsigned int, TQString)),
+            this, TQ_SLOT(slotTextChanged(unsigned int, TQString)));
 
-    connect(m_colourtable, TQT_SIGNAL(entryColourChanged(unsigned int, TQColor)),
-            this, TQT_SLOT(slotColourChanged(unsigned int, TQColor)));
+    connect(m_colourtable, TQ_SIGNAL(entryColourChanged(unsigned int, TQColor)),
+            this, TQ_SLOT(slotColourChanged(unsigned int, TQColor)));
 
     addTab(frame, i18n("Color Map"));
 
diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp
index 3af923d..cc218cf 100644
--- a/src/gui/configuration/GeneralConfigurationPage.cpp
+++ b/src/gui/configuration/GeneralConfigurationPage.cpp
@@ -192,8 +192,8 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
 
     TQPushButton *showStatusButton = new TQPushButton(i18n("Details..."),
                                     frame);
-    TQObject::connect(showStatusButton, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotShowStatus()));
+    TQObject::connect(showStatusButton, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotShowStatus()));
     layout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
     ++row;
 
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index b1cb0d4..e97ebee 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -215,11 +215,11 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent,
                                     frameOtherHeaders);
     layoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
 
-    connect(addPropButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotAddNewProperty()));
+    connect(addPropButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotAddNewProperty()));
 
-    connect(deletePropButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotDeleteProperty()));
+    connect(deletePropButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotDeleteProperty()));
 }
 
 void
diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp
index f910616..e850adb 100644
--- a/src/gui/configuration/LatencyConfigurationPage.cpp
+++ b/src/gui/configuration/LatencyConfigurationPage.cpp
@@ -68,8 +68,8 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
 
     layout->addWidget(m_fetchLatencyValues, 1, 3);
 
-    connect(m_fetchLatencyValues, TQT_SIGNAL(released()),
-            TQT_SLOT(slotFetchLatencyValues()));
+    connect(m_fetchLatencyValues, TQ_SIGNAL(released()),
+            TQ_SLOT(slotFetchLatencyValues()));
 
     int jackPlaybackValue = (m_cfg->readLongNumEntry(
                                  "jackplaybacklatencyusec", 0) / 1000) +
@@ -83,8 +83,8 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
     TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
                                            frame);
     layout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
-    connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
-            jackPlaybackLabel, TQT_SLOT(setNum(int)));
+    connect(m_jackPlayback, TQ_SIGNAL(valueChanged(int)),
+            jackPlaybackLabel, TQ_SLOT(setNum(int)));
 
     m_jackPlayback->setMinValue(0);
     layout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
@@ -106,8 +106,8 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
     TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
                                          frame);
     layout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
-    connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),
-            jackRecordLabel, TQT_SLOT(setNum(int)));
+    connect(m_jackRecord, TQ_SIGNAL(valueChanged(int)),
+            jackRecordLabel, TQ_SLOT(setNum(int)));
 
     m_jackRecord->setMinValue(0);
     layout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp
index ea5c632..84f5d6d 100644
--- a/src/gui/configuration/MIDIConfigurationPage.cpp
+++ b/src/gui/configuration/MIDIConfigurationPage.cpp
@@ -191,14 +191,14 @@ MIDIConfigurationPage::MIDIConfigurationPage(
         m_soundFontChoose->setEnabled(false);
     }
 
-    connect(m_sfxLoadEnabled, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(slotSoundFontToggled(bool)));
+    connect(m_sfxLoadEnabled, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(slotSoundFontToggled(bool)));
 
-    connect(m_sfxLoadChoose, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotSfxLoadPathChoose()));
+    connect(m_sfxLoadChoose, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotSfxLoadPathChoose()));
 
-    connect(m_soundFontChoose, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotSoundFontChoose()));
+    connect(m_soundFontChoose, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotSoundFontChoose()));
 
     layout->setRowStretch(row, 10);
 
@@ -363,7 +363,7 @@ MIDIConfigurationPage::apply()
     int midiClock = m_midiSync->currentItem();
     m_cfg->writeEntry("midiclock", midiClock);
 
-    // Now send it (OLD TQT_METHOD - to be removed)
+    // Now send it (OLD METHOD - to be removed)
     //!!! No, don't remove -- this controls SPP as well doesn't it?
     //
     MappedEvent mEMIDIClock(MidiInstrumentBase,  // InstrumentId
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index 0546361..e588449 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -444,14 +444,14 @@ NotationConfigurationPage::NotationConfigurationPage(TDEConfig *cfg,
     m_viewButton = new TQPushButton(i18n("View"), frame);
     layout->addMultiCellWidget(m_font, row, row, 1, 2);
     layout->addWidget(m_viewButton, row, 3);
-    TQObject::connect(m_viewButton, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotViewButtonPressed()));
+    TQObject::connect(m_viewButton, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotViewButtonPressed()));
 #else
     layout->addMultiCellWidget(m_font, row, row, 1, 3);
 #endif
     m_font->setEditable(false);
-    TQObject::connect(m_font, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotFontComboChanged(int)));
+    TQObject::connect(m_font, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotFontComboChanged(int)));
     ++row;
 
     TQFrame *subFrame = new TQFrame(frame);