Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

5 files changed, 113 insertions, 113 deletions

diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 8038f95..7d9abe8 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -254,32 +254,32 @@ AudioInstrumentParameterPanel::AudioInstrumentParameterPanel(RosegardenGUIDoc* d
 
     gridLayout->setRowStretch(2, 1);
 
-    connect(m_audioFader, TQT_SIGNAL(audioChannelsChanged(int)),
-            this, TQT_SLOT(slotAudioChannels(int)));
+    connect(m_audioFader, TQ_SIGNAL(audioChannelsChanged(int)),
+            this, TQ_SLOT(slotAudioChannels(int)));
 
-    connect(m_audioFader->m_signalMapper, TQT_SIGNAL(mapped(int)),
-            this, TQT_SLOT(slotSelectPlugin(int)));
+    connect(m_audioFader->m_signalMapper, TQ_SIGNAL(mapped(int)),
+            this, TQ_SLOT(slotSelectPlugin(int)));
 
-    connect(m_audioFader->m_fader, TQT_SIGNAL(faderChanged(float)),
-            this, TQT_SLOT(slotSelectAudioLevel(float)));
+    connect(m_audioFader->m_fader, TQ_SIGNAL(faderChanged(float)),
+            this, TQ_SLOT(slotSelectAudioLevel(float)));
 
-    connect(m_audioFader->m_recordFader, TQT_SIGNAL(faderChanged(float)),
-            this, TQT_SLOT(slotSelectAudioRecordLevel(float)));
+    connect(m_audioFader->m_recordFader, TQ_SIGNAL(faderChanged(float)),
+            this, TQ_SLOT(slotSelectAudioRecordLevel(float)));
 
-    connect(m_audioFader->m_pan, TQT_SIGNAL(valueChanged(float)),
-            this, TQT_SLOT(slotSetPan(float)));
+    connect(m_audioFader->m_pan, TQ_SIGNAL(valueChanged(float)),
+            this, TQ_SLOT(slotSetPan(float)));
 
-    connect(m_audioFader->m_audioOutput, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(slotAudioRoutingChanged()));
+    connect(m_audioFader->m_audioOutput, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(slotAudioRoutingChanged()));
 
-    connect(m_audioFader->m_audioInput, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(slotAudioRoutingChanged()));
+    connect(m_audioFader->m_audioInput, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(slotAudioRoutingChanged()));
 
-    connect(m_audioFader->m_synthButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotSynthButtonClicked()));
+    connect(m_audioFader->m_synthButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotSynthButtonClicked()));
 
-    connect(m_audioFader->m_synthGUIButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotSynthGUIButtonClicked()));
+    connect(m_audioFader->m_synthGUIButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotSynthGUIButtonClicked()));
 }
 
 void
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index 2bb6292..f5ce071 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -84,39 +84,39 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
     m_audioInstrumentParameters->adjustSize();
     m_noInstrumentParameters->adjustSize();
 
-    connect(m_audioInstrumentParameters, TQT_SIGNAL(updateAllBoxes()),
-            this, TQT_SLOT(slotUpdateAllBoxes()));
+    connect(m_audioInstrumentParameters, TQ_SIGNAL(updateAllBoxes()),
+            this, TQ_SLOT(slotUpdateAllBoxes()));
 
     connect(m_audioInstrumentParameters,
-            TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+            TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
             this,
-            TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+            TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
 
     connect(m_audioInstrumentParameters,
-            TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
+            TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)),
             this,
-            TQT_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)));
+            TQ_SIGNAL(selectPlugin(TQWidget *, InstrumentId, int)));
 
     connect(m_audioInstrumentParameters,
-            TQT_SIGNAL(showPluginGUI(InstrumentId, int)),
+            TQ_SIGNAL(showPluginGUI(InstrumentId, int)),
             this,
-            TQT_SIGNAL(showPluginGUI(InstrumentId, int)));
+            TQ_SIGNAL(showPluginGUI(InstrumentId, int)));
 
-    connect(m_midiInstrumentParameters, TQT_SIGNAL(updateAllBoxes()),
-            this, TQT_SLOT(slotUpdateAllBoxes()));
+    connect(m_midiInstrumentParameters, TQ_SIGNAL(updateAllBoxes()),
+            this, TQ_SLOT(slotUpdateAllBoxes()));
 
     connect(m_midiInstrumentParameters,
-            TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
-            this, TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
+            TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
+            this, TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
 
     connect(m_audioInstrumentParameters,
-            TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
-            this, TQT_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
+            TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)),
+            this, TQ_SIGNAL(changeInstrumentLabel(InstrumentId, TQString)));
 
     connect(m_midiInstrumentParameters,
-            TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+            TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
             this,
-            TQT_SIGNAL(instrumentParametersChanged(InstrumentId)));
+            TQ_SIGNAL(instrumentParametersChanged(InstrumentId)));
 
     // Layout the groups left to right.
 
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index e837028..f962ef7 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -150,32 +150,32 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
 
     // Connect up the toggle boxes
     //
-    connect(m_percussionCheckBox, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(slotTogglePercussion(bool)));
+    connect(m_percussionCheckBox, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(slotTogglePercussion(bool)));
 
-    connect(m_programCheckBox, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(slotToggleProgramChange(bool)));
+    connect(m_programCheckBox, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(slotToggleProgramChange(bool)));
 
-    connect(m_bankCheckBox, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(slotToggleBank(bool)));
+    connect(m_bankCheckBox, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(slotToggleBank(bool)));
 
-    connect(m_variationCheckBox, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(slotToggleVariation(bool)));
+    connect(m_variationCheckBox, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(slotToggleVariation(bool)));
 
 
     // Connect activations
     //
-    connect(m_bankValue, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotSelectBank(int)));
+    connect(m_bankValue, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotSelectBank(int)));
 
-    connect(m_variationValue, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotSelectVariation(int)));
+    connect(m_variationValue, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotSelectVariation(int)));
 
-    connect(m_programValue, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotSelectProgram(int)));
+    connect(m_programValue, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotSelectProgram(int)));
 
-    connect(m_channelValue, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotSelectChannel(int)));
+    connect(m_channelValue, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotSelectChannel(int)));
 
     // don't select any of the options in any dropdown
     m_programValue->setCurrentItem( -1);
@@ -183,8 +183,8 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
     m_channelValue->setCurrentItem( -1);
     m_variationValue->setCurrentItem( -1);
 
-    connect(m_rotaryMapper, TQT_SIGNAL(mapped(int)),
-            this, TQT_SLOT(slotControllerChanged(int)));
+    connect(m_rotaryMapper, TQ_SIGNAL(mapped(int)),
+            this, TQ_SLOT(slotControllerChanged(int)));
 }
 
 void
@@ -415,8 +415,8 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
 
             // Connect
             //
-            connect(rotary, TQT_SIGNAL(valueChanged(float)),
-                    m_rotaryMapper, TQT_SLOT(map()));
+            connect(rotary, TQ_SIGNAL(valueChanged(float)),
+                    m_rotaryMapper, TQ_SLOT(map()));
 
             rmi = m_rotaries.end();
         }
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 1b28dc9..b23ee9a 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -96,8 +96,8 @@ SegmentParameterBox::SegmentParameterBox(RosegardenGUIDoc* doc,
 
     m_doc->getComposition().addObserver(this);
 
-    connect(getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-            this, TQT_SLOT(update()));
+    connect(getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+            this, TQ_SLOT(update()));
 }
 
 SegmentParameterBox::~SegmentParameterBox()
@@ -143,15 +143,15 @@ SegmentParameterBox::initBox()
     m_labelButton->setFont(font);
     //    m_labelButton->setFixedWidth(50);
 
-    connect(m_labelButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotEditSegmentLabel()));
+    connect(m_labelButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotEditSegmentLabel()));
 
     m_repeatValue = new TristateCheckBox(this);
     m_repeatValue->setFont(font);
     //m_repeatValue->setFixedHeight(comboHeight);
 
     // handle state changes
-    connect(m_repeatValue, TQT_SIGNAL(pressed()), TQT_SLOT(slotRepeatPressed()));
+    connect(m_repeatValue, TQ_SIGNAL(pressed()), TQ_SLOT(slotRepeatPressed()));
 
     // non-reversing motif style read-only combo
     m_quantizeValue = new KComboBox(this);
@@ -159,8 +159,8 @@ SegmentParameterBox::initBox()
     //m_quantizeValue->setFixedHeight(comboHeight);
 
     // handle quantize changes from drop down
-    connect(m_quantizeValue, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotQuantizeSelected(int)));
+    connect(m_quantizeValue, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotQuantizeSelected(int)));
 
     // reversing motif style read-write combo
     m_transposeValue = new KComboBox(this);
@@ -168,12 +168,12 @@ SegmentParameterBox::initBox()
     //m_transposeValue->setFixedHeight(comboHeight);
 
     // handle transpose combo changes
-    connect(m_transposeValue, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotTransposeSelected(int)));
+    connect(m_transposeValue, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotTransposeSelected(int)));
 
     // and text changes
-    connect(m_transposeValue, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotTransposeTextChanged(const TQString&)));
+    connect(m_transposeValue, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotTransposeTextChanged(const TQString&)));
 
     // reversing motif style read-write combo
     m_delayValue = new KComboBox(this);
@@ -181,16 +181,16 @@ SegmentParameterBox::initBox()
     //m_delayValue->setFixedHeight(comboHeight);
 
     // handle delay combo changes
-    connect(m_delayValue, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotDelaySelected(int)));
+    connect(m_delayValue, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotDelaySelected(int)));
 
     // Detect when the document colours are updated
-    connect(m_doc, TQT_SIGNAL(docColoursChanged()),
-            this, TQT_SLOT(slotDocColoursChanged()));
+    connect(m_doc, TQ_SIGNAL(docColoursChanged()),
+            this, TQ_SLOT(slotDocColoursChanged()));
 
     // handle text changes for delay
-    connect(m_delayValue, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotDelayTextChanged(const TQString &)));
+    connect(m_delayValue, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotDelayTextChanged(const TQString &)));
 
     // set up combo box for colours
     m_colourValue = new KComboBox(false, this);
@@ -200,8 +200,8 @@ SegmentParameterBox::initBox()
     m_colourValue->setSizeLimit(20);
 
     // handle colour combo changes
-    connect(m_colourValue, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotColourSelected(int)));
+    connect(m_colourValue, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotColourSelected(int)));
 
     // pre-set width of buttons so they don't grow later
 //    width = fontMetrics.width(i18n("used internally for spacing", "High: ----"));
@@ -214,8 +214,8 @@ SegmentParameterBox::initBox()
 //    m_highButton->setFont(font);
 //    m_highButton->setMinimumWidth(width);
 
-//    connect(m_highButton, TQT_SIGNAL(released()),
-//            TQT_SLOT(slotHighestPressed()));
+//    connect(m_highButton, TQ_SIGNAL(released()),
+//            TQ_SLOT(slotHighestPressed()));
 
     // lowest playable note
     //
@@ -225,14 +225,14 @@ SegmentParameterBox::initBox()
 //    m_lowButton->setFont(font);
 //    m_lowButton->setMinimumWidth(width);
 
-//    connect(m_lowButton, TQT_SIGNAL(released()),
-//            TQT_SLOT(slotLowestPressed()));
+//    connect(m_lowButton, TQ_SIGNAL(released()),
+//            TQ_SLOT(slotLowestPressed()));
 
     // Audio autofade enabled
     //
 //    m_autoFadeBox = new TQCheckBox(this);
-//    connect(m_autoFadeBox, TQT_SIGNAL(stateChanged(int)),
-//            this, TQT_SLOT(slotAudioFadeChanged(int)));
+//    connect(m_autoFadeBox, TQ_SIGNAL(stateChanged(int)),
+//            this, TQ_SLOT(slotAudioFadeChanged(int)));
 
     // Fade in and out times
     //
@@ -240,15 +240,15 @@ SegmentParameterBox::initBox()
 //    m_fadeInSpin->setMinValue(0);
 //    m_fadeInSpin->setMaxValue(5000);
 //    m_fadeInSpin->setSuffix(i18n(" ms"));
-//    connect(m_fadeInSpin, TQT_SIGNAL(valueChanged(int)),
-//            this, TQT_SLOT(slotFadeInChanged(int)));
+//    connect(m_fadeInSpin, TQ_SIGNAL(valueChanged(int)),
+//            this, TQ_SLOT(slotFadeInChanged(int)));
 
 //    m_fadeOutSpin = new TQSpinBox(this);
 //    m_fadeOutSpin->setMinValue(0);
 //    m_fadeOutSpin->setMaxValue(5000);
 //    m_fadeOutSpin->setSuffix(i18n(" ms"));
-//    connect(m_fadeOutSpin, TQT_SIGNAL(valueChanged(int)),
-//            this, TQT_SLOT(slotFadeOutChanged(int)));
+//    connect(m_fadeOutSpin, TQ_SIGNAL(valueChanged(int)),
+//            this, TQ_SLOT(slotFadeOutChanged(int)));
 
     label->setFont(font);
     repeatLabel->setFont(font);
@@ -382,14 +382,14 @@ void
 SegmentParameterBox::setDocument(RosegardenGUIDoc* doc)
 {
     if (m_doc != 0)
-        disconnect(m_doc, TQT_SIGNAL(docColoursChanged()),
-                   this, TQT_SLOT(slotDocColoursChanged()));
+        disconnect(m_doc, TQ_SIGNAL(docColoursChanged()),
+                   this, TQ_SLOT(slotDocColoursChanged()));
 
     m_doc = doc;
 
     // Detect when the document colours are updated
-    connect (m_doc, TQT_SIGNAL(docColoursChanged()),
-             this, TQT_SLOT(slotDocColoursChanged()));
+    connect (m_doc, TQ_SIGNAL(docColoursChanged()),
+             this, TQ_SLOT(slotDocColoursChanged()));
 
     slotDocColoursChanged(); // repopulate combo
 }
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index e453543..febded0 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -304,8 +304,8 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
     groupLayout->addMultiCellWidget(m_transpLbl, row, row, 3, 4, AlignRight);
     m_defTranspose = new KComboBox(m_defaultsGroup);
 
-    connect(m_defTranspose, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotTransposeIndexChanged(int)));
+    connect(m_defTranspose, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotTransposeIndexChanged(int)));
 
     int transposeRange = 48;
     for (int i = -transposeRange; i < transposeRange + 1; i++) {
@@ -359,43 +359,43 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
     mainLayout->setRowStretch(mainLayout->numRows() - 1, 1);
 
     // Connections
-    connect( m_playDevice, TQT_SIGNAL(activated(int)),
-             this, TQT_SLOT(slotPlaybackDeviceChanged(int)));
+    connect( m_playDevice, TQ_SIGNAL(activated(int)),
+             this, TQ_SLOT(slotPlaybackDeviceChanged(int)));
 
-    connect( m_instrument, TQT_SIGNAL(activated(int)),
-             this, TQT_SLOT(slotInstrumentChanged(int)));
+    connect( m_instrument, TQ_SIGNAL(activated(int)),
+             this, TQ_SLOT(slotInstrumentChanged(int)));
 
-    connect( m_recDevice, TQT_SIGNAL(activated(int)),
-             this, TQT_SLOT(slotRecordingDeviceChanged(int)));
+    connect( m_recDevice, TQ_SIGNAL(activated(int)),
+             this, TQ_SLOT(slotRecordingDeviceChanged(int)));
 
-    connect( m_recChannel, TQT_SIGNAL(activated(int)),
-             this, TQT_SLOT(slotRecordingChannelChanged(int)));
+    connect( m_recChannel, TQ_SIGNAL(activated(int)),
+             this, TQ_SLOT(slotRecordingChannelChanged(int)));
 
-    connect( m_defClef, TQT_SIGNAL(activated(int)),
-             this, TQT_SLOT(slotClefChanged(int)));
+    connect( m_defClef, TQ_SIGNAL(activated(int)),
+             this, TQ_SLOT(slotClefChanged(int)));
 
     // Detect when the document colours are updated
-    connect(m_doc, TQT_SIGNAL(docColoursChanged()),
-            this, TQT_SLOT(slotDocColoursChanged()));
+    connect(m_doc, TQ_SIGNAL(docColoursChanged()),
+            this, TQ_SLOT(slotDocColoursChanged()));
 
     // handle colour combo changes
-    connect(m_defColor, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotColorChanged(int)));
+    connect(m_defColor, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotColorChanged(int)));
 
-    connect(m_highButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotHighestPressed()));
+    connect(m_highButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotHighestPressed()));
 
-    connect(m_lowButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotLowestPressed()));
+    connect(m_lowButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotLowestPressed()));
 
-    connect(m_presetButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotPresetPressed()));
+    connect(m_presetButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotPresetPressed()));
 
-    connect(m_staffSizeCombo, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotStaffSizeChanged(int)));
+    connect(m_staffSizeCombo, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotStaffSizeChanged(int)));
 
-    connect(m_staffBracketCombo, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotStaffBracketChanged(int)));
+    connect(m_staffBracketCombo, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotStaffBracketChanged(int)));
 }
 
 TrackParameterBox::~TrackParameterBox()