Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 147 insertions, 147 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index c73b4ff..905ff3a 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -95,13 +95,13 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
     populate();
 
     KStdAction::close(this,
-                      TQT_SLOT(slotClose()),
+                      TQ_SLOT(slotClose()),
                       actionCollection());
 
     TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                              ("transport-play")));
     TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
-                TQT_SIGNAL(play()), actionCollection(), "play");
+                TQ_SIGNAL(play()), actionCollection(), "play");
     // Alternative shortcut for Play
     TDEShortcut playShortcut = play->shortcut();
     playShortcut.append( KKey(Key_Return + CTRL) );
@@ -110,68 +110,68 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-stop")));
     new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
-                TQT_SIGNAL(stop()), actionCollection(), "stop");
+                TQ_SIGNAL(stop()), actionCollection(), "stop");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind")));
     new TDEAction(i18n("Re&wind"), icon, Key_End, this,
-                TQT_SIGNAL(rewindPlayback()), actionCollection(),
+                TQ_SIGNAL(rewindPlayback()), actionCollection(),
                 "playback_pointer_back_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd")));
     new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
-                TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
+                TQ_SIGNAL(fastForwardPlayback()), actionCollection(),
                 "playback_pointer_forward_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind-end")));
     new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
-                TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
+                TQ_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
                 "playback_pointer_start");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd-end")));
     new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
-                TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
+                TQ_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
                 "playback_pointer_end");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-record")));
     new TDEAction(i18n("&Record"), icon, 0, this,
-                TQT_SIGNAL(record()), actionCollection(),
+                TQ_SIGNAL(record()), actionCollection(),
                 "record");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-panic")));
     new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
-                TQT_SIGNAL(panic()), actionCollection(),
+                TQ_SIGNAL(panic()), actionCollection(),
                 "panic");
 
     unsigned int mixerOptions = m_studio->getMixerDisplayOptions();
 
     (new TDEToggleAction(i18n("Show Audio &Faders"), 0, this,
-                       TQT_SLOT(slotToggleFaders()), actionCollection(),
+                       TQ_SLOT(slotToggleFaders()), actionCollection(),
                        "show_audio_faders"))->setChecked
     (!(mixerOptions & MIXER_OMIT_FADERS));
 
     (new TDEToggleAction(i18n("Show Synth &Faders"), 0, this,
-                       TQT_SLOT(slotToggleSynthFaders()), actionCollection(),
+                       TQ_SLOT(slotToggleSynthFaders()), actionCollection(),
                        "show_synth_faders"))->setChecked
     (!(mixerOptions & MIXER_OMIT_SYNTH_FADERS));
 
     (new TDEToggleAction(i18n("Show &Submasters"), 0, this,
-                       TQT_SLOT(slotToggleSubmasters()), actionCollection(),
+                       TQ_SLOT(slotToggleSubmasters()), actionCollection(),
                        "show_audio_submasters"))->setChecked
     (!(mixerOptions & MIXER_OMIT_SUBMASTERS));
 
     (new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, this,
-                       TQT_SLOT(slotTogglePluginButtons()), actionCollection(),
+                       TQ_SLOT(slotTogglePluginButtons()), actionCollection(),
                        "show_plugin_buttons"))->setChecked
     (!(mixerOptions & MIXER_OMIT_PLUGINS));
 
     (new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, this,
-                       TQT_SLOT(slotToggleUnassignedFaders()), actionCollection(),
+                       TQ_SLOT(slotToggleUnassignedFaders()), actionCollection(),
                        "show_unassigned_faders"))->setChecked
     (mixerOptions & MIXER_SHOW_UNASSIGNED_FADERS);
 
@@ -181,7 +181,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
         action =
             new TDERadioAction(i18n("1 Input", "%n Inputs", i),
                              0, this,
-                             TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
+                             TQ_SLOT(slotSetInputCountFromAction()), actionCollection(),
                              TQString("inputs_%1").arg(i).ascii());
         action->setExclusiveGroup("inputs");
         if (i == int(m_studio->getRecordIns().size()))
@@ -191,7 +191,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
     action = new TDERadioAction
              (i18n("No Submasters"),
               0, this,
-              TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
+              TQ_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
               TQString("submasters_0").ascii());
     action->setExclusiveGroup("submasters");
     action->setChecked(true);
@@ -200,7 +200,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
         action = new TDERadioAction
                  (i18n("1 Submaster", "%n Submasters", i),
                   0, this,
-                  TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
+                  TQ_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
                   TQString("submasters_%1").arg(i).ascii());
         action->setExclusiveGroup("submasters");
         if (i == int(m_studio->getBusses().size()) - 1)
@@ -388,8 +388,8 @@ AudioMixerWindow::populate()
             TQToolTip::add
                 (plugin, i18n("Audio plugin button"));
             rec.m_plugins.push_back(plugin);
-            connect(plugin, TQT_SIGNAL(clicked()),
-                    this, TQT_SLOT(slotSelectPlugin()));
+            connect(plugin, TQ_SIGNAL(clicked()),
+                    this, TQ_SLOT(slotSelectPlugin()));
         }
 
         TQLabel *idLabel;
@@ -441,30 +441,30 @@ AudioMixerWindow::populate()
         updatePluginButtons((*i)->getId());
 
         if (rec.m_input) {
-            connect(rec.m_input, TQT_SIGNAL(changed()),
-                    this, TQT_SLOT(slotInputChanged()));
+            connect(rec.m_input, TQ_SIGNAL(changed()),
+                    this, TQ_SLOT(slotInputChanged()));
         }
 
-        connect(rec.m_output, TQT_SIGNAL(changed()),
-                this, TQT_SLOT(slotOutputChanged()));
+        connect(rec.m_output, TQ_SIGNAL(changed()),
+                this, TQ_SLOT(slotOutputChanged()));
 
-        connect(rec.m_fader, TQT_SIGNAL(faderChanged(float)),
-                this, TQT_SLOT(slotFaderLevelChanged(float)));
+        connect(rec.m_fader, TQ_SIGNAL(faderChanged(float)),
+                this, TQ_SLOT(slotFaderLevelChanged(float)));
 
-        connect(rec.m_pan, TQT_SIGNAL(valueChanged(float)),
-                this, TQT_SLOT(slotPanChanged(float)));
+        connect(rec.m_pan, TQ_SIGNAL(valueChanged(float)),
+                this, TQ_SLOT(slotPanChanged(float)));
 
-        connect(rec.m_soloButton, TQT_SIGNAL(clicked()),
-                this, TQT_SLOT(slotSoloChanged()));
+        connect(rec.m_soloButton, TQ_SIGNAL(clicked()),
+                this, TQ_SLOT(slotSoloChanged()));
 
-        connect(rec.m_muteButton, TQT_SIGNAL(clicked()),
-                this, TQT_SLOT(slotMuteChanged()));
+        connect(rec.m_muteButton, TQ_SIGNAL(clicked()),
+                this, TQ_SLOT(slotMuteChanged()));
 
-        connect(rec.m_stereoButton, TQT_SIGNAL(clicked()),
-                this, TQT_SLOT(slotChannelsChanged()));
+        connect(rec.m_stereoButton, TQ_SIGNAL(clicked()),
+                this, TQ_SLOT(slotChannelsChanged()));
 
-        connect(rec.m_recordButton, TQT_SIGNAL(clicked()),
-                this, TQT_SLOT(slotRecordChanged()));
+        connect(rec.m_recordButton, TQ_SIGNAL(clicked()),
+                this, TQ_SLOT(slotRecordChanged()));
 
         ++count;
 
@@ -519,8 +519,8 @@ AudioMixerWindow::populate()
             TQToolTip::add
                 (plugin, i18n("Audio plugin button"));
             rec.m_plugins.push_back(plugin);
-            connect(plugin, TQT_SIGNAL(clicked()),
-                    this, TQT_SLOT(slotSelectPlugin()));
+            connect(plugin, TQ_SIGNAL(clicked()),
+                    this, TQ_SLOT(slotSelectPlugin()));
         }
 
         TQLabel *idLabel = new TQLabel(i18n("Sub %1").arg(count), m_mainBox, "subMaster");
@@ -546,14 +546,14 @@ AudioMixerWindow::populate()
         updateFader(count);
         updatePluginButtons(count);
 
-        connect(rec.m_fader, TQT_SIGNAL(faderChanged(float)),
-                this, TQT_SLOT(slotFaderLevelChanged(float)));
+        connect(rec.m_fader, TQ_SIGNAL(faderChanged(float)),
+                this, TQ_SLOT(slotFaderLevelChanged(float)));
 
-        connect(rec.m_pan, TQT_SIGNAL(valueChanged(float)),
-                this, TQT_SLOT(slotPanChanged(float)));
+        connect(rec.m_pan, TQ_SIGNAL(valueChanged(float)),
+                this, TQ_SLOT(slotPanChanged(float)));
 
-        connect(rec.m_muteButton, TQT_SIGNAL(clicked()),
-                this, TQT_SLOT(slotMuteChanged()));
+        connect(rec.m_muteButton, TQ_SIGNAL(clicked()),
+                this, TQ_SLOT(slotMuteChanged()));
 
         ++count;
 
@@ -597,11 +597,11 @@ AudioMixerWindow::populate()
         m_master = rec;
         updateFader(0);
 
-        connect(rec.m_fader, TQT_SIGNAL(faderChanged(float)),
-                this, TQT_SLOT(slotFaderLevelChanged(float)));
+        connect(rec.m_fader, TQ_SIGNAL(faderChanged(float)),
+                this, TQ_SLOT(slotFaderLevelChanged(float)));
 
-        connect(rec.m_muteButton, TQT_SIGNAL(clicked()),
-                this, TQT_SLOT(slotMuteChanged()));
+        connect(rec.m_muteButton, TQ_SIGNAL(clicked()),
+                this, TQ_SLOT(slotMuteChanged()));
     }
 
     m_mainBox->show();
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 819f031..3116884 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -113,10 +113,10 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
     layout->addWidget(m_closeButton);
     layout->addSpacing(5);
 
-    connect(m_applyButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotApply()));
-    connect(m_resetButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotReset()));
+    connect(m_applyButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotApply()));
+    connect(m_resetButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotReset()));
 
     //
     // Left-side list view
@@ -191,8 +191,8 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
         (m_pastePrograms,
                 i18n("Paste Program names from clipboard to current Bank"));
 
-    connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-            this, TQT_SLOT(slotPopulateDevice(TQListViewItem*)));
+    connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+            this, TQ_SLOT(slotPopulateDevice(TQListViewItem*)));
 
     TQFrame *vbox = new TQFrame(splitter);
     TQVBoxLayout *vboxLayout = new TQVBoxLayout(vbox, 8, 6);
@@ -217,44 +217,44 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
     m_variationCombo->insertItem(i18n("MSB"));
 
     // device/bank modification
-    connect(m_listView, TQT_SIGNAL(itemRenamed (TQListViewItem*, const TQString&, int)),
-            this, TQT_SLOT(slotModifyDeviceOrBankName(TQListViewItem*, const TQString&, int)));
+    connect(m_listView, TQ_SIGNAL(itemRenamed (TQListViewItem*, const TQString&, int)),
+            this, TQ_SLOT(slotModifyDeviceOrBankName(TQListViewItem*, const TQString&, int)));
 
-    connect(m_addBank, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotAddBank()));
+    connect(m_addBank, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotAddBank()));
 
-    connect(m_addKeyMapping, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotAddKeyMapping()));
+    connect(m_addKeyMapping, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotAddKeyMapping()));
 
-    connect(m_delete, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotDelete()));
+    connect(m_delete, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotDelete()));
 
-    connect(m_deleteAll, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotDeleteAll()));
+    connect(m_deleteAll, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotDeleteAll()));
 
-    connect(m_importBanks, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotImport()));
+    connect(m_importBanks, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotImport()));
 
-    connect(m_exportBanks, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotExport()));
+    connect(m_exportBanks, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotExport()));
 
-    connect(m_copyPrograms, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotEditCopy()));
+    connect(m_copyPrograms, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotEditCopy()));
 
-    connect(m_pastePrograms, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotEditPaste()));
+    connect(m_pastePrograms, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotEditPaste()));
 
-    connect(m_variationToggle, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotVariationToggled()));
+    connect(m_variationToggle, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotVariationToggled()));
 
-    connect(m_variationCombo, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotVariationChanged(int)));
+    connect(m_variationCombo, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotVariationChanged(int)));
 
     setupActions();
 
     m_doc->getCommandHistory()->attachView(actionCollection());
-    connect(m_doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-            this, TQT_SLOT(slotUpdate()));
+    connect(m_doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+            this, TQ_SLOT(slotUpdate()));
 
     // Initialise the dialog
     //
@@ -301,14 +301,14 @@ BankEditorDialog::~BankEditorDialog()
 void
 BankEditorDialog::setupActions()
 {
-    TDEAction* close = KStdAction::close (this, TQT_SLOT(slotFileClose()), actionCollection());
+    TDEAction* close = KStdAction::close (this, TQ_SLOT(slotFileClose()), actionCollection());
 
     m_closeButton->setText(close->text());
-    connect(m_closeButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotFileClose()));
+    connect(m_closeButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotFileClose()));
 
-    KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
-    KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
+    KStdAction::copy (this, TQ_SLOT(slotEditCopy()), actionCollection());
+    KStdAction::paste (this, TQ_SLOT(slotEditPaste()), actionCollection());
 
     // some adjustments
 
diff --git a/src/gui/studio/DeviceEditorDialog.cpp b/src/gui/studio/DeviceEditorDialog.cpp
index d71dd6f..d56bf43 100644
--- a/src/gui/studio/DeviceEditorDialog.cpp
+++ b/src/gui/studio/DeviceEditorDialog.cpp
@@ -90,11 +90,11 @@ DeviceEditorDialog::DeviceEditorDialog(TQWidget *parent,
     TQPushButton *addButton = new TQPushButton(i18n("Add Play Device"), hbox);
     TQPushButton *addRButton = new TQPushButton(i18n("Add Record Device"), hbox);
     TQPushButton *deleteButton = new TQPushButton(i18n("Delete Device"), hbox);
-    connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddPlayDevice()));
-    connect(addRButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddRecordDevice()));
-    connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteDevice()));
-    connect(m_table, TQT_SIGNAL(valueChanged(int, int)),
-            this, TQT_SLOT(slotValueChanged (int, int)));
+    connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddPlayDevice()));
+    connect(addRButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddRecordDevice()));
+    connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteDevice()));
+    connect(m_table, TQ_SIGNAL(valueChanged(int, int)),
+            this, TQ_SLOT(slotValueChanged (int, int)));
 
     setMinimumHeight(250);
 
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 727110d..b319d2a 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -138,17 +138,17 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
             (m_controllersButton,
                     i18n("View and edit Control Events for the selected device - these are special Event types that you can define against your device and control through Control Rulers or the Instrument Parameter Box "));
 
-        connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddPlayDevice()));
-        connect(m_deletePlayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeletePlayDevice()));
-        connect(m_importButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotImport()));
-        connect(m_exportButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport()));
-        connect(m_banksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetBanks()));
-        connect(m_controllersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetControllers()));
-
-        connect(m_playTable, TQT_SIGNAL(valueChanged(int, int)),
-                this, TQT_SLOT(slotPlayValueChanged (int, int)));
-        connect(m_playTable, TQT_SIGNAL(currentChanged(int, int)),
-                this, TQT_SLOT(slotPlayDeviceSelected (int, int)));
+        connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddPlayDevice()));
+        connect(m_deletePlayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeletePlayDevice()));
+        connect(m_importButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotImport()));
+        connect(m_exportButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport()));
+        connect(m_banksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetBanks()));
+        connect(m_controllersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetControllers()));
+
+        connect(m_playTable, TQ_SIGNAL(valueChanged(int, int)),
+                this, TQ_SLOT(slotPlayValueChanged (int, int)));
+        connect(m_playTable, TQ_SIGNAL(currentChanged(int, int)),
+                this, TQ_SLOT(slotPlayDeviceSelected (int, int)));
 
         mainLayout->addWidget(groupBox);
         groupBox = new TQGroupBox(2, TQt::Horizontal, i18n("Record devices"), mainBox);
@@ -181,15 +181,15 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
             (m_deleteRecordButton,
                     i18n("Delete the selected device"));
 
-        connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddRecordDevice()));
-        connect(m_deleteRecordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteRecordDevice()));
+        connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddRecordDevice()));
+        connect(m_deleteRecordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteRecordDevice()));
 
-        connect(m_recordTable, TQT_SIGNAL(currentChanged(int, int)),
-                this, TQT_SLOT(slotRecordDeviceSelected (int, int)));
-        connect(m_recordTable, TQT_SIGNAL(valueChanged(int, int)),
-                this, TQT_SLOT(slotRecordValueChanged (int, int)));
+        connect(m_recordTable, TQ_SIGNAL(currentChanged(int, int)),
+                this, TQ_SLOT(slotRecordDeviceSelected (int, int)));
+        connect(m_recordTable, TQ_SIGNAL(valueChanged(int, int)),
+                this, TQ_SLOT(slotRecordValueChanged (int, int)));
 
-        connect(document, TQT_SIGNAL(devicesResyncd()), this, TQT_SLOT(slotDevicesResyncd()));
+        connect(document, TQ_SIGNAL(devicesResyncd()), this, TQ_SLOT(slotDevicesResyncd()));
 
         m_noConnectionString = i18n("No connection");
 
@@ -213,11 +213,11 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         layout->addSpacing(5);
 
         TDEAction* close = KStdAction::close(this,
-                                           TQT_SLOT(slotClose()),
+                                           TQ_SLOT(slotClose()),
                                            actionCollection());
 
         closeButton->setText(close->text());
-        connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+        connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
 
         mainLayout->addWidget(btnBox);
 
@@ -237,8 +237,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         createGUI("devicemanager.rc");
 
         m_document->getCommandHistory()->attachView(actionCollection());
-        connect(m_document->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-                this, TQT_SLOT(populate()));
+        connect(m_document->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+                this, TQ_SLOT(populate()));
 
         m_playTable->setCurrentCell( -1, 0);
         m_recordTable->setCurrentCell( -1, 0);
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index 5b1184d..1fb13bc 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -71,13 +71,13 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
     setupTabs();
 
     KStdAction::close(this,
-                      TQT_SLOT(slotClose()),
+                      TQ_SLOT(slotClose()),
                       actionCollection());
 
     TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                              ("transport-play")));
     TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
-                TQT_SIGNAL(play()), actionCollection(), "play");
+                TQ_SIGNAL(play()), actionCollection(), "play");
     // Alternative shortcut for Play
     TDEShortcut playShortcut = play->shortcut();
     playShortcut.append( KKey(Key_Return + CTRL) );
@@ -86,42 +86,42 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-stop")));
     new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
-                TQT_SIGNAL(stop()), actionCollection(), "stop");
+                TQ_SIGNAL(stop()), actionCollection(), "stop");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind")));
     new TDEAction(i18n("Re&wind"), icon, Key_End, this,
-                TQT_SIGNAL(rewindPlayback()), actionCollection(),
+                TQ_SIGNAL(rewindPlayback()), actionCollection(),
                 "playback_pointer_back_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd")));
     new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
-                TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
+                TQ_SIGNAL(fastForwardPlayback()), actionCollection(),
                 "playback_pointer_forward_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind-end")));
     new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
-                TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
+                TQ_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
                 "playback_pointer_start");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd-end")));
     new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
-                TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
+                TQ_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
                 "playback_pointer_end");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-record")));
     new TDEAction(i18n("&Record"), icon, 0, this,
-                TQT_SIGNAL(record()), actionCollection(),
+                TQ_SIGNAL(record()), actionCollection(),
                 "record");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-panic")));
     new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
-                TQT_SIGNAL(panic()), actionCollection(),
+                TQ_SIGNAL(panic()), actionCollection(),
                 "panic");
 
     createGUI("midimixer.rc");
@@ -144,8 +144,8 @@ MidiMixerWindow::setupTabs()
     //
     m_tabWidget = new TQTabWidget(this);
     setCentralWidget(m_tabWidget);
-    connect(m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget *)),
-            this, TQT_SLOT(slotCurrentTabChanged(TQWidget *)));
+    connect(m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget *)),
+            this, TQ_SLOT(slotCurrentTabChanged(TQWidget *)));
     m_tabWidget->setTabPosition(TQTabWidget::Bottom);
     setCaption(i18n("MIDI Mixer"));
 
@@ -246,8 +246,8 @@ MidiMixerWindow::setupTabs()
 
                     controller->setKnobColour(knobColour);
 
-                    connect(controller, TQT_SIGNAL(valueChanged(float)),
-                            this, TQT_SLOT(slotControllerChanged(float)));
+                    connect(controller, TQ_SIGNAL(valueChanged(float)),
+                            this, TQ_SLOT(slotControllerChanged(float)));
 
                     mainLayout->addWidget(controller, i + 1, posCount,
                                           TQt::AlignCenter);
@@ -291,8 +291,8 @@ MidiMixerWindow::setupTabs()
 
                 // Connect them up
                 //
-                connect(fader, TQT_SIGNAL(faderChanged(float)),
-                        this, TQT_SLOT(slotFaderLevelChanged(float)));
+                connect(fader, TQ_SIGNAL(faderChanged(float)),
+                        this, TQ_SLOT(slotFaderLevelChanged(float)));
 
                 // Update all the faders and controllers
                 //
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index 82f2192..658400a 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -91,8 +91,8 @@ MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
     gridLayout->addWidget(new TQLabel(i18n("Percussion"), frame),
                           0, 0, AlignLeft);
     gridLayout->addWidget(m_percussion, 0, 1, AlignLeft);
-    connect(m_percussion, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotNewPercussion()));
+    connect(m_percussion, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotNewPercussion()));
 
     gridLayout->addWidget(new TQLabel(i18n("MSB Value"), frame),
                           1, 0, AlignLeft);
@@ -108,8 +108,8 @@ MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
         (m_lsb,
                 i18n("Selects a LSB controller Bank number (MSB/LSB pairs are always unique for any Device)"));
 
-    connect(m_msb, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(slotNewMSB(int)));
+    connect(m_msb, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(slotNewMSB(int)));
 
     gridLayout->addWidget(new TQLabel(i18n("LSB Value"), frame),
                           2, 0, AlignLeft);
@@ -117,8 +117,8 @@ MidiProgramsEditor::makeAdditionalWidget(TQWidget *parent)
     m_lsb->setMaxValue(127);
     gridLayout->addWidget(m_lsb, 2, 1, AlignLeft);
 
-    connect(m_lsb, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(slotNewLSB(int)));
+    connect(m_lsb, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(slotNewLSB(int)));
 
     return frame;
 }
@@ -472,12 +472,12 @@ MidiProgramsEditor::slotEntryButtonPressed()
     int currentEntry = 0;
 
     menu->insertItem(i18n("<no key mapping>"), this,
-                     TQT_SLOT(slotEntryMenuItemSelected(int)), 0, 0);
+                     TQ_SLOT(slotEntryMenuItemSelected(int)), 0, 0);
     menu->setItemParameter(0, 0);
 
     for (int i = 0; i < kml.size(); ++i) {
         menu->insertItem(strtoqstr(kml[i].getName()),
-                         this, TQT_SLOT(slotEntryMenuItemSelected(int)),
+                         this, TQ_SLOT(slotEntryMenuItemSelected(int)),
                          0, i + 1);
         menu->setItemParameter(i + 1, i + 1);
         if (currentMapping && (kml[i] == *currentMapping))
diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp
index 0abd9b8..8071a2d 100644
--- a/src/gui/studio/NameSetEditor.cpp
+++ b/src/gui/studio/NameSetEditor.cpp
@@ -103,9 +103,9 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
                     // Initial label; button to adjust whether labels start at 0 or 1
                     m_initialLabel = new TQPushButton(numberText, numBox);
                     connect(m_initialLabel,
-                            TQT_SIGNAL(clicked()),
+                            TQ_SIGNAL(clicked()),
                             this,
-                            TQT_SLOT(slotToggleInitialLabel()));
+                            TQ_SLOT(slotToggleInitialLabel()));
                 } else {
                     TQLabel *label = new TQLabel(numberText, numBox);
                     label->setFixedWidth(40);
@@ -120,8 +120,8 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
                     button->setMaximumWidth(40);
                     button->setMaximumHeight(20);
                     button->setFlat(true);
-                    connect(button, TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(slotEntryButtonPressed()));
+                    connect(button, TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(slotEntryButtonPressed()));
                     m_entryButtons.push_back(button);
                 }
 
@@ -132,9 +132,9 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor,
                 m_names.push_back(lineEdit);
 
                 connect(m_names[labelId],
-                        TQT_SIGNAL(textChanged(const TQString&)),
+                        TQ_SIGNAL(textChanged(const TQString&)),
                         this,
-                        TQT_SLOT(slotNameChanged(const TQString&)));
+                        TQ_SLOT(slotNameChanged(const TQString&)));
 
                 ++labelId;
             }
diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp
index 90fa599..26f56e6 100644
--- a/src/gui/studio/RemapInstrumentDialog.cpp
+++ b/src/gui/studio/RemapInstrumentDialog.cpp
@@ -65,8 +65,8 @@ RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *parent,
     m_instrumentButton = new TQRadioButton(i18n("Instrument"), m_buttonGroup);
 
 
-    connect(m_buttonGroup, TQT_SIGNAL(released(int)),
-            this, TQT_SLOT(slotRemapReleased(int)));
+    connect(m_buttonGroup, TQ_SIGNAL(released(int)),
+            this, TQ_SLOT(slotRemapReleased(int)));
 
     TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal,
                                         i18n("Choose Source and Destination"),
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index 4c05314..6a293b2 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -133,8 +133,8 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
                 }
             }
 
-            connect(pluginCombo, TQT_SIGNAL(activated(int)),
-                    this, TQT_SLOT(slotPluginChanged(int)));
+            connect(pluginCombo, TQ_SIGNAL(activated(int)),
+                    this, TQ_SLOT(slotPluginChanged(int)));
 
             pluginLayout->addWidget(pluginCombo, i, 1);
 
@@ -142,7 +142,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
 
             TQPushButton *controlsButton = new TQPushButton(i18n("Controls"), pluginFrame);
             pluginLayout->addWidget(controlsButton, i, 2);
-            connect(controlsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotControlsButtonClicked()));
+            connect(controlsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotControlsButtonClicked()));
             m_controlsButtons.push_back(controlsButton);
 
 #ifdef HAVE_LIBLO
@@ -151,7 +151,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
             pluginLayout->addWidget(guiButton, i, 3);
             guiButton->setEnabled(m_guiManager->hasGUI
                                   (id, Instrument::SYNTH_PLUGIN_POSITION));
-            connect(guiButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGUIButtonClicked()));
+            connect(guiButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGUIButtonClicked()));
             m_guiButtons.push_back(guiButton);
 #endif
 
@@ -170,11 +170,11 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
         layout->addSpacing(5);
 
         TDEAction* close = KStdAction::close(this,
-                                           TQT_SLOT(slotClose()),
+                                           TQ_SLOT(slotClose()),
                                            actionCollection());
 
         closeButton->setText(close->text());
-        connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+        connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
 
         mainLayout->addWidget(btnBox);
 
diff --git a/src/gui/studio/TimerCallbackAssistant.cpp b/src/gui/studio/TimerCallbackAssistant.cpp
index 453e620..e37c5b6 100644
--- a/src/gui/studio/TimerCallbackAssistant.cpp
+++ b/src/gui/studio/TimerCallbackAssistant.cpp
@@ -36,7 +36,7 @@ TimerCallbackAssistant::TimerCallbackAssistant(int ms, void (*callback)(void *da
         m_data(data)
 {
     TQTimer *timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCallback()));
+    connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCallback()));
     timer->start(ms, FALSE);
 }