Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

14 files changed, 231 insertions, 231 deletions

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index f910299..3c1fcd3 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -149,20 +149,20 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
     layout->addWidget(m_closeButton);
     layout->addSpacing(5);
 
-    connect(m_addButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotAdd()));
+    connect(m_addButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotAdd()));
 
-    connect(m_deleteButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotDelete()));
+    connect(m_deleteButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotDelete()));
 
     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()));
 
-    connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-            TQT_SLOT(slotEdit(TQListViewItem *)));
+    connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+            TQ_SLOT(slotEdit(TQListViewItem *)));
 
     // Highlight all columns - enable extended selection mode
     //
@@ -336,11 +336,11 @@ void
 ControlEditorDialog::setupActions()
 {
     TDEAction* close = KStdAction::close(this,
-                                       TQT_SLOT(slotClose()),
+                                       TQ_SLOT(slotClose()),
                                        actionCollection());
 
     m_closeButton->setText(close->text());
-    connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+    connect(m_closeButton, TQ_SIGNAL(released()), this, TQ_SLOT(slotClose()));
 
     // some adjustments
     new TDEToolBarPopupAction(i18n("Und&o"),
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 3c3c76b..1d84837 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -112,32 +112,32 @@ ControlParameterEditDialog::ControlParameterEditDialog(
     m_ipbPosition = new KComboBox(frame);
     layout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
 
-    connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotNameChanged(const TQString&)));
+    connect(m_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotNameChanged(const TQString&)));
 
-    connect(m_typeCombo, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotTypeChanged(int)));
+    connect(m_typeCombo, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotTypeChanged(int)));
 
-    connect(m_description, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotDescriptionChanged(const TQString &)));
+    connect(m_description, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotDescriptionChanged(const TQString &)));
 
-    connect(m_controllerBox, TQT_SIGNAL(valueChanged(int)),
-            TQT_SLOT(slotControllerChanged(int)));
+    connect(m_controllerBox, TQ_SIGNAL(valueChanged(int)),
+            TQ_SLOT(slotControllerChanged(int)));
 
-    connect(m_minBox, TQT_SIGNAL(valueChanged(int)),
-            TQT_SLOT(slotMinChanged(int)));
+    connect(m_minBox, TQ_SIGNAL(valueChanged(int)),
+            TQ_SLOT(slotMinChanged(int)));
 
-    connect(m_maxBox, TQT_SIGNAL(valueChanged(int)),
-            TQT_SLOT(slotMaxChanged(int)));
+    connect(m_maxBox, TQ_SIGNAL(valueChanged(int)),
+            TQ_SLOT(slotMaxChanged(int)));
 
-    connect(m_defaultBox, TQT_SIGNAL(valueChanged(int)),
-            TQT_SLOT(slotDefaultChanged(int)));
+    connect(m_defaultBox, TQ_SIGNAL(valueChanged(int)),
+            TQ_SLOT(slotDefaultChanged(int)));
 
-    connect(m_colourCombo, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotColourChanged(int)));
+    connect(m_colourCombo, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotColourChanged(int)));
 
-    connect(m_ipbPosition, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotIPBPositionChanged(int)));
+    connect(m_ipbPosition, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotIPBPositionChanged(int)));
 
     //m_nameEdit->selectAll();
     //m_description->selectAll();
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 058d030..3be2998 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -139,29 +139,29 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
     layout->addWidget(m_closeButton);
     layout->addSpacing(5);
 
-    connect(m_addButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotAdd()));
+    connect(m_addButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotAdd()));
 
-    connect(m_deleteButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotDelete()));
+    connect(m_deleteButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotDelete()));
 
-    connect(m_closeButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotClose()));
+    connect(m_closeButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotClose()));
 
-    connect(m_deleteAllButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotDeleteAll()));
+    connect(m_deleteAllButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotDeleteAll()));
 
     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()));
 
-    connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-            TQT_SLOT(slotEdit(TQListViewItem *)));
+    connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+            TQ_SLOT(slotEdit(TQListViewItem *)));
 
-    connect(m_listView, TQT_SIGNAL(pressed(TQListViewItem *)),
-            this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+    connect(m_listView, TQ_SIGNAL(pressed(TQListViewItem *)),
+            this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
 
     // Highlight all columns - enable extended selection mode
     //
@@ -366,11 +366,11 @@ void
 MarkerEditor::setupActions()
 {
     TDEAction* close = KStdAction::close(this,
-                                       TQT_SLOT(slotClose()),
+                                       TQ_SLOT(slotClose()),
                                        actionCollection());
 
     m_closeButton->setText(close->text());
-    connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+    connect(m_closeButton, TQ_SIGNAL(released()), this, TQ_SLOT(slotClose()));
 
     // some adjustments
     new TDEToolBarPopupAction(i18n("Und&o"),
@@ -395,7 +395,7 @@ MarkerEditor::setupActions()
     TQIconSet icon(pixmap);
 
     action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
-                              TQT_SLOT(slotMusicalTime()),
+                              TQ_SLOT(slotMusicalTime()),
                               actionCollection(), "time_musical");
     action->setExclusiveGroup("timeMode");
     if (timeMode == 0)
@@ -405,7 +405,7 @@ MarkerEditor::setupActions()
     icon = TQIconSet(pixmap);
 
     action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
-                              TQT_SLOT(slotRealTime()),
+                              TQ_SLOT(slotRealTime()),
                               actionCollection(), "time_real");
     action->setExclusiveGroup("timeMode");
     if (timeMode == 1)
@@ -415,7 +415,7 @@ MarkerEditor::setupActions()
     icon = TQIconSet(pixmap);
 
     action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
-                              TQT_SLOT(slotRawTime()),
+                              TQ_SLOT(slotRawTime()),
                               actionCollection(), "time_raw");
     action->setExclusiveGroup("timeMode");
     if (timeMode == 2)
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index 877e93b..42cb5bc 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -78,29 +78,29 @@ PlayList::PlayList(TQWidget *parent, const char *name)
     m_deleteButton ->setText(i18n("Delete"));
     m_clearButton ->setText(i18n("Clear"));
 
-    connect(m_openButton, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotOpenFiles()));
+    connect(m_openButton, TQ_SIGNAL(clicked()),
+            TQ_SLOT(slotOpenFiles()));
 
-    connect(m_playButton, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotPlay()));
+    connect(m_playButton, TQ_SIGNAL(clicked()),
+            TQ_SLOT(slotPlay()));
 
-    connect(m_deleteButton, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotDeleteCurrent()));
+    connect(m_deleteButton, TQ_SIGNAL(clicked()),
+            TQ_SLOT(slotDeleteCurrent()));
 
-    connect(m_clearButton, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotClear()));
+    connect(m_clearButton, TQ_SIGNAL(clicked()),
+            TQ_SLOT(slotClear()));
 
-    connect(m_moveUpButton, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotMoveUp()));
+    connect(m_moveUpButton, TQ_SIGNAL(clicked()),
+            TQ_SLOT(slotMoveUp()));
 
-    connect(m_moveDownButton, TQT_SIGNAL(clicked()),
-            TQT_SLOT(slotMoveDown()));
+    connect(m_moveDownButton, TQ_SIGNAL(clicked()),
+            TQ_SLOT(slotMoveDown()));
 
-    connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-            TQT_SLOT(slotCurrentItemChanged(TQListViewItem*)));
+    connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+            TQ_SLOT(slotCurrentItemChanged(TQListViewItem*)));
 
-    connect(m_listView, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)),
-            TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
+    connect(m_listView, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)),
+            TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
 
     restore();
 
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 98bbb62..cf2ca74 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -106,18 +106,18 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
 
     m_layout->addStretch(20);
 
-    connect(m_recordSigMapper, TQT_SIGNAL(mapped(int)),
-            this, TQT_SLOT(slotToggleRecordTrack(int)));
+    connect(m_recordSigMapper, TQ_SIGNAL(mapped(int)),
+            this, TQ_SLOT(slotToggleRecordTrack(int)));
 
-    connect(m_muteSigMapper, TQT_SIGNAL(mapped(int)),
-            this, TQT_SLOT(slotToggleMutedTrack(int)));
+    connect(m_muteSigMapper, TQ_SIGNAL(mapped(int)),
+            this, TQ_SLOT(slotToggleMutedTrack(int)));
 
     // connect signal mappers
-    connect(m_instListSigMapper, TQT_SIGNAL(mapped(int)),
-            this, TQT_SLOT(slotInstrumentSelection(int)));
+    connect(m_instListSigMapper, TQ_SIGNAL(mapped(int)),
+            this, TQ_SLOT(slotInstrumentSelection(int)));
 
-    connect(m_clickedSigMapper, TQT_SIGNAL(mapped(int)),
-            this, TQT_SIGNAL(trackSelected(int)));
+    connect(m_clickedSigMapper, TQ_SIGNAL(mapped(int)),
+            this, TQ_SIGNAL(trackSelected(int)));
 
     //     // Populate instrument popup menu just once at start-up
     //     //
@@ -767,8 +767,8 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
 
             // Connect up the submenu
             //
-            connect(subMenu, TQT_SIGNAL(activated(int)),
-                    TQT_SLOT(slotInstrumentPopupActivated(int)));
+            connect(subMenu, TQ_SIGNAL(activated(int)),
+                    TQ_SLOT(slotInstrumentPopupActivated(int)));
 
         } else if (!instrUsedByMe) {
 
@@ -1066,10 +1066,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     record->off();
 
     // Connect them to their sigmappers
-    connect(record, TQT_SIGNAL(stateChanged(bool)),
-            m_recordSigMapper, TQT_SLOT(map()));
-    connect(mute, TQT_SIGNAL(stateChanged(bool)),
-            m_muteSigMapper, TQT_SLOT(map()));
+    connect(record, TQ_SIGNAL(stateChanged(bool)),
+            m_recordSigMapper, TQ_SLOT(map()));
+    connect(mute, TQ_SIGNAL(stateChanged(bool)),
+            m_muteSigMapper, TQ_SLOT(map()));
     m_recordSigMapper->setMapping(record, track->getPosition());
     m_muteSigMapper->setMapping(mute, track->getPosition());
 
@@ -1101,8 +1101,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     trackLabel->setFixedHeight(m_cellSize - buttonGap);
     trackLabel->setIndent(7);
 
-    connect(trackLabel, TQT_SIGNAL(renameTrack(TQString, TrackId)),
-            TQT_SLOT(slotRenameTrack(TQString, TrackId)));
+    connect(trackLabel, TQ_SIGNAL(renameTrack(TQString, TrackId)),
+            TQ_SLOT(slotRenameTrack(TQString, TrackId)));
 
     // Store the TrackLabel pointer
     //
@@ -1111,10 +1111,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
     // Connect it
     setButtonMapping(trackLabel, trackId);
 
-    connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()),
-            m_instListSigMapper, TQT_SLOT(map()));
-    connect(trackLabel, TQT_SIGNAL(clicked()),
-            m_clickedSigMapper, TQT_SLOT(map()));
+    connect(trackLabel, TQ_SIGNAL(changeToInstrumentList()),
+            m_instListSigMapper, TQ_SLOT(map()));
+    connect(trackLabel, TQ_SIGNAL(clicked()),
+            m_clickedSigMapper, TQ_SLOT(map()));
 
     //
     // instrument label
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index e32c4b3..9a76cda 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -162,10 +162,10 @@ TrackEditor::init(TQWidget* rosegardenguiview)
                          m_doc->getStudio(),
                          m_rulerScale, getTrackCellHeight());
 
-    connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
-            m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
-    connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
-            m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
+    connect(rosegardenguiview, TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
+            m_compositionModel, TQ_SLOT(slotInstrumentParametersChanged(InstrumentId)));
+    connect(rosegardenguiview->parent(), TQ_SIGNAL(instrumentParametersChanged(InstrumentId)),
+            m_compositionModel, TQ_SLOT(slotInstrumentParametersChanged(InstrumentId)));
 
     m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
 
@@ -221,105 +221,105 @@ TrackEditor::init(TQWidget* rosegardenguiview)
     m_trackButtonScroll->setBottomMargin(m_bottomStandardRuler->height() +
                                          m_segmentCanvas->horizontalScrollBar()->height());
 
-    connect(m_trackButtons, TQT_SIGNAL(widthChanged()),
-            this, TQT_SLOT(slotTrackButtonsWidthChanged()));
+    connect(m_trackButtons, TQ_SIGNAL(widthChanged()),
+            this, TQ_SLOT(slotTrackButtonsWidthChanged()));
 
-    connect(m_trackButtons, TQT_SIGNAL(trackSelected(int)),
-            rosegardenguiview, TQT_SLOT(slotSelectTrackSegments(int)));
+    connect(m_trackButtons, TQ_SIGNAL(trackSelected(int)),
+            rosegardenguiview, TQ_SLOT(slotSelectTrackSegments(int)));
 
-    connect(m_trackButtons, TQT_SIGNAL(instrumentSelected(int)),
-            rosegardenguiview, TQT_SLOT(slotUpdateInstrumentParameterBox(int)));
+    connect(m_trackButtons, TQ_SIGNAL(instrumentSelected(int)),
+            rosegardenguiview, TQ_SLOT(slotUpdateInstrumentParameterBox(int)));
 
-    connect(this, TQT_SIGNAL(stateChange(TQString, bool)),
-            rosegardenguiview, TQT_SIGNAL(stateChange(TQString, bool)));
+    connect(this, TQ_SIGNAL(stateChange(TQString, bool)),
+            rosegardenguiview, TQ_SIGNAL(stateChange(TQString, bool)));
 
-    connect(m_trackButtons, TQT_SIGNAL(modified()),
-            m_doc, TQT_SLOT(slotDocumentModified()));
+    connect(m_trackButtons, TQ_SIGNAL(modified()),
+            m_doc, TQ_SLOT(slotDocumentModified()));
 
-    connect(m_trackButtons, TQT_SIGNAL(muteButton(TrackId, bool)),
-            rosegardenguiview, TQT_SLOT(slotSetMuteButton(TrackId, bool)));
+    connect(m_trackButtons, TQ_SIGNAL(muteButton(TrackId, bool)),
+            rosegardenguiview, TQ_SLOT(slotSetMuteButton(TrackId, bool)));
 
     // connect loop rulers' follow-scroll signals
-    connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
-            m_segmentCanvas, TQT_SLOT(startAutoScroll(int)));
-    connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
-            m_segmentCanvas, TQT_SLOT(stopAutoScroll()));
-    connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)),
-            m_segmentCanvas, TQT_SLOT(startAutoScroll(int)));
-    connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()),
-            m_segmentCanvas, TQT_SLOT(stopAutoScroll()));
-
-    connect(m_segmentCanvas, TQT_SIGNAL(contentsMoving(int, int)),
-            this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    connect(m_topStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+            m_segmentCanvas, TQ_SLOT(startAutoScroll(int)));
+    connect(m_topStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+            m_segmentCanvas, TQ_SLOT(stopAutoScroll()));
+    connect(m_bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(startMouseMove(int)),
+            m_segmentCanvas, TQ_SLOT(startAutoScroll(int)));
+    connect(m_bottomStandardRuler->getLoopRuler(), TQ_SIGNAL(stopMouseMove()),
+            m_segmentCanvas, TQ_SLOT(stopAutoScroll()));
+
+    connect(m_segmentCanvas, TQ_SIGNAL(contentsMoving(int, int)),
+            this, TQ_SLOT(slotCanvasScrolled(int, int)));
 
     // Synchronize bar buttons' scrollview with segment canvas' scrollbar
     //
-    connect(m_segmentCanvas->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(slotVerticalScrollTrackButtons(int)));
+    connect(m_segmentCanvas->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(slotVerticalScrollTrackButtons(int)));
 
-    connect(m_segmentCanvas->verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-            this, TQT_SLOT(slotVerticalScrollTrackButtons(int)));
+    connect(m_segmentCanvas->verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+            this, TQ_SLOT(slotVerticalScrollTrackButtons(int)));
 
     // scrolling with mouse wheel
-    connect(m_trackButtonScroll, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)),
-            m_segmentCanvas, TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
+    connect(m_trackButtonScroll, TQ_SIGNAL(gotWheelEvent(TQWheelEvent*)),
+            m_segmentCanvas, TQ_SLOT(slotExternalWheelEvent(TQWheelEvent*)));
 
     // Connect horizontal scrollbar
     //
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-            m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-            m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+            m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+            m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
 
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-            m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-            m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+            m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+            m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
 
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-            m_tempoRuler, TQT_SLOT(slotScrollHoriz(int)));
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-            m_tempoRuler, TQT_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+            m_tempoRuler, TQ_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+            m_tempoRuler, TQ_SLOT(slotScrollHoriz(int)));
 
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-            m_chordNameRuler, TQT_SLOT(slotScrollHoriz(int)));
-    connect(m_segmentCanvas->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-            m_chordNameRuler, TQT_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+            m_chordNameRuler, TQ_SLOT(slotScrollHoriz(int)));
+    connect(m_segmentCanvas->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+            m_chordNameRuler, TQ_SLOT(slotScrollHoriz(int)));
 
-    connect(this, TQT_SIGNAL(needUpdate()), m_segmentCanvas, TQT_SLOT(slotUpdateSegmentsDrawBuffer()));
+    connect(this, TQ_SIGNAL(needUpdate()), m_segmentCanvas, TQ_SLOT(slotUpdateSegmentsDrawBuffer()));
 
     connect(m_segmentCanvas->getModel(),
-            TQT_SIGNAL(selectedSegments(const SegmentSelection &)),
+            TQ_SIGNAL(selectedSegments(const SegmentSelection &)),
             rosegardenguiview,
-            TQT_SLOT(slotSelectedSegments(const SegmentSelection &)));
+            TQ_SLOT(slotSelectedSegments(const SegmentSelection &)));
 
-    connect(m_segmentCanvas, TQT_SIGNAL(zoomIn()),
-            RosegardenGUIApp::self(), TQT_SLOT(slotZoomIn()));
-    connect(m_segmentCanvas, TQT_SIGNAL(zoomOut()),
-            RosegardenGUIApp::self(), TQT_SLOT(slotZoomOut()));
+    connect(m_segmentCanvas, TQ_SIGNAL(zoomIn()),
+            RosegardenGUIApp::self(), TQ_SLOT(slotZoomIn()));
+    connect(m_segmentCanvas, TQ_SIGNAL(zoomOut()),
+            RosegardenGUIApp::self(), TQ_SLOT(slotZoomOut()));
 
-    connect(getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-            this, TQT_SLOT(update()));
+    connect(getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+            this, TQ_SLOT(update()));
 
-    connect(m_doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
-            this, TQT_SLOT(slotSetPointerPosition(timeT)));
+    connect(m_doc, TQ_SIGNAL(pointerPositionChanged(timeT)),
+            this, TQ_SLOT(slotSetPointerPosition(timeT)));
 
     //
     // pointer and loop drag signals from top and bottom bar buttons (loop rulers actually)
     //
-    connect(m_topStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
-            this, TQT_SLOT(slotPointerDraggedToPosition(timeT)));
-    connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
-            this, TQT_SLOT(slotPointerDraggedToPosition(timeT)));
+    connect(m_topStandardRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+            this, TQ_SLOT(slotPointerDraggedToPosition(timeT)));
+    connect(m_bottomStandardRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+            this, TQ_SLOT(slotPointerDraggedToPosition(timeT)));
 
-    connect(m_topStandardRuler, TQT_SIGNAL(dragLoopToPosition(timeT)),
-            this, TQT_SLOT(slotLoopDraggedToPosition(timeT)));
-    connect(m_bottomStandardRuler, TQT_SIGNAL(dragLoopToPosition(timeT)),
-            this, TQT_SLOT(slotLoopDraggedToPosition(timeT)));
+    connect(m_topStandardRuler, TQ_SIGNAL(dragLoopToPosition(timeT)),
+            this, TQ_SLOT(slotLoopDraggedToPosition(timeT)));
+    connect(m_bottomStandardRuler, TQ_SIGNAL(dragLoopToPosition(timeT)),
+            this, TQ_SLOT(slotLoopDraggedToPosition(timeT)));
 
-    connect(m_doc, TQT_SIGNAL(loopChanged(timeT,
+    connect(m_doc, TQ_SIGNAL(loopChanged(timeT,
                                       timeT)),
-            this, TQT_SLOT(slotSetLoop(timeT, timeT)));
+            this, TQ_SLOT(slotSetLoop(timeT, timeT)));
 }
 
 void TrackEditor::slotReadjustCanvasSize()
@@ -756,7 +756,7 @@ void TrackEditor::dropEvent(TQDropEvent* event)
             // WARNING
             //
             // DO NOT PERFORM ANY OPERATIONS AFTER THAT
-            // EMITTING THIS TQT_SIGNAL TRIGGERS THE LOADING OF A NEW DOCUMENT
+            // EMITTING THIS TQ_SIGNAL TRIGGERS THE LOADING OF A NEW DOCUMENT
             // AND AS A CONSEQUENCE THE DELETION OF THIS TrackEditor OBJECT
             //
         } else {
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 123d91a..d0b6f5e 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -68,8 +68,8 @@ TrackLabel::TrackLabel(TrackId id,
 
     m_pressTimer = new TQTimer(this);
 
-    connect(m_pressTimer, TQT_SIGNAL(timeout()),
-            this, TQT_SIGNAL(changeToInstrumentList()));
+    connect(m_pressTimer, TQ_SIGNAL(timeout()),
+            this, TQ_SIGNAL(changeToInstrumentList()));
 
     TQToolTip::add
         (this, i18n("Click and hold with left mouse button to assign this Track to an Instrument."));
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index cb343d9..d086a18 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -133,29 +133,29 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
     layout->addWidget(m_closeButton);
     layout->addSpacing(5);
 
-    connect(m_addButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotAdd()));
+    connect(m_addButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotAdd()));
 
-    connect(m_deleteButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotDelete()));
+    connect(m_deleteButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotDelete()));
 
-    connect(m_closeButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotClose()));
+    connect(m_closeButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotClose()));
 
-    connect(m_deleteAllButton, TQT_SIGNAL(released()),
-            TQT_SLOT(slotDeleteAll()));
+    connect(m_deleteAllButton, TQ_SIGNAL(released()),
+            TQ_SLOT(slotDeleteAll()));
 
     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()));
 
-    connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-            TQT_SLOT(slotEdit(TQListViewItem *)));
+    connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+            TQ_SLOT(slotEdit(TQListViewItem *)));
 
-    connect(m_listView, TQT_SIGNAL(pressed(TQListViewItem *)),
-            this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+    connect(m_listView, TQ_SIGNAL(pressed(TQListViewItem *)),
+            this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
 
     // Highlight all columns - enable extended selection mode
     //
@@ -374,11 +374,11 @@ void
 TriggerSegmentManager::setupActions()
 {
     TDEAction* close = KStdAction::close(this,
-                                       TQT_SLOT(slotClose()),
+                                       TQ_SLOT(slotClose()),
                                        actionCollection());
 
     m_closeButton->setText(close->text());
-    connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+    connect(m_closeButton, TQ_SIGNAL(released()), this, TQ_SLOT(slotClose()));
 
     TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
 
@@ -396,7 +396,7 @@ TriggerSegmentManager::setupActions()
                             KStdAction::stdName(KStdAction::Redo));
 
     new TDEAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, this,
-                TQT_SLOT(slotPasteAsNew()), actionCollection(),
+                TQ_SLOT(slotPasteAsNew()), actionCollection(),
                 "paste_to_trigger_segment");
 
     kapp->config()->setGroup(TriggerManagerConfigGroup);
@@ -408,7 +408,7 @@ TriggerSegmentManager::setupActions()
     TQIconSet icon(pixmap);
 
     action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
-                              TQT_SLOT(slotMusicalTime()),
+                              TQ_SLOT(slotMusicalTime()),
                               actionCollection(), "time_musical");
     action->setExclusiveGroup("timeMode");
     if (timeMode == 0)
@@ -418,7 +418,7 @@ TriggerSegmentManager::setupActions()
     icon = TQIconSet(pixmap);
 
     action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
-                              TQT_SLOT(slotRealTime()),
+                              TQ_SLOT(slotRealTime()),
                               actionCollection(), "time_real");
     action->setExclusiveGroup("timeMode");
     if (timeMode == 1)
@@ -428,7 +428,7 @@ TriggerSegmentManager::setupActions()
     icon = TQIconSet(pixmap);
 
     action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
-                              TQT_SLOT(slotRawTime()),
+                              TQ_SLOT(slotRawTime()),
                               actionCollection(), "time_raw");
     action->setExclusiveGroup("timeMode");
     if (timeMode == 2)
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
index a30f33d..f85c45e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
@@ -449,8 +449,8 @@ void CompositionModelImpl::updatePreviewCacheForAudioSegment(const Segment* segm
             AudioPreviewUpdater *updater = new AudioPreviewUpdater
                                            (*m_audioPreviewThread, m_composition, segment, segRect, this);
 
-            connect(updater, TQT_SIGNAL(audioPreviewComplete(AudioPreviewUpdater*)),
-                    this, TQT_SLOT(slotAudioPreviewComplete(AudioPreviewUpdater*)));
+            connect(updater, TQ_SIGNAL(audioPreviewComplete(AudioPreviewUpdater*)),
+                    this, TQ_SLOT(slotAudioPreviewComplete(AudioPreviewUpdater*)));
 
             m_audioPreviewUpdaterMap[segment] = updater;
 
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 445fc33..0e055a2 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -130,8 +130,8 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
     if (doc) {
         m_toolBox = new SegmentToolBox(this, doc);
 
-        connect(m_toolBox, TQT_SIGNAL(showContextHelp(const TQString &)),
-                this, TQT_SLOT(slotToolHelpChanged(const TQString &)));
+        connect(m_toolBox, TQ_SIGNAL(showContextHelp(const TQString &)),
+                this, TQ_SLOT(slotToolHelpChanged(const TQString &)));
     }
     
     setDragAutoScroll(true);
@@ -144,43 +144,43 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
     TQScrollBar* hsb = horizontalScrollBar();
 
     // dynamically adjust content size when scrolling past current composition's end
-    connect(hsb, TQT_SIGNAL(nextLine()),
-            this, TQT_SLOT(scrollRight()));
-    connect(hsb, TQT_SIGNAL(prevLine()),
-            this, TQT_SLOT(scrollLeft()));
-
-    //    connect(this, TQT_SIGNAL(contentsMoving(int, int)),
-    //            this, TQT_SLOT(slotAllDrawBuffersNeedRefresh()));
-
-    //     connect(this, TQT_SIGNAL(contentsMoving(int, int)),
-    //             this, TQT_SLOT(slotContentsMoving(int, int)));
-
-    connect(model, TQT_SIGNAL(needContentUpdate()),
-            this, TQT_SLOT(slotUpdateSegmentsDrawBuffer()));
-    connect(model, TQT_SIGNAL(needContentUpdate(const TQRect&)),
-            this, TQT_SLOT(slotUpdateSegmentsDrawBuffer(const TQRect&)));
-    connect(model, TQT_SIGNAL(needArtifactsUpdate()),
-            this, TQT_SLOT(slotArtifactsDrawBufferNeedsRefresh()));
-    connect(model, TQT_SIGNAL(needSizeUpdate()),
-            this, TQT_SLOT(slotUpdateSize()));
+    connect(hsb, TQ_SIGNAL(nextLine()),
+            this, TQ_SLOT(scrollRight()));
+    connect(hsb, TQ_SIGNAL(prevLine()),
+            this, TQ_SLOT(scrollLeft()));
+
+    //    connect(this, TQ_SIGNAL(contentsMoving(int, int)),
+    //            this, TQ_SLOT(slotAllDrawBuffersNeedRefresh()));
+
+    //     connect(this, TQ_SIGNAL(contentsMoving(int, int)),
+    //             this, TQ_SLOT(slotContentsMoving(int, int)));
+
+    connect(model, TQ_SIGNAL(needContentUpdate()),
+            this, TQ_SLOT(slotUpdateSegmentsDrawBuffer()));
+    connect(model, TQ_SIGNAL(needContentUpdate(const TQRect&)),
+            this, TQ_SLOT(slotUpdateSegmentsDrawBuffer(const TQRect&)));
+    connect(model, TQ_SIGNAL(needArtifactsUpdate()),
+            this, TQ_SLOT(slotArtifactsDrawBufferNeedsRefresh()));
+    connect(model, TQ_SIGNAL(needSizeUpdate()),
+            this, TQ_SLOT(slotUpdateSize()));
 
     if (doc) {
-        connect(doc, TQT_SIGNAL(docColoursChanged()),
-                this, TQT_SLOT(slotRefreshColourCache()));
+        connect(doc, TQ_SIGNAL(docColoursChanged()),
+                this, TQ_SLOT(slotRefreshColourCache()));
 
         // recording-related signals
-        connect(doc, TQT_SIGNAL(newMIDIRecordingSegment(Segment*)),
-                this, TQT_SLOT(slotNewMIDIRecordingSegment(Segment*)));
-        connect(doc, TQT_SIGNAL(newAudioRecordingSegment(Segment*)),
-                this, TQT_SLOT(slotNewAudioRecordingSegment(Segment*)));
-        //     connect(doc, TQT_SIGNAL(recordMIDISegmentUpdated(Segment*, timeT)),
-        //             this, TQT_SLOT(slotRecordMIDISegmentUpdated(Segment*, timeT)));
-        connect(doc, TQT_SIGNAL(stoppedAudioRecording()),
-                this, TQT_SLOT(slotStoppedRecording()));
-        connect(doc, TQT_SIGNAL(stoppedMIDIRecording()),
-                this, TQT_SLOT(slotStoppedRecording()));
-        connect(doc, TQT_SIGNAL(audioFileFinalized(Segment*)),
-                getModel(), TQT_SLOT(slotAudioFileFinalized(Segment*)));
+        connect(doc, TQ_SIGNAL(newMIDIRecordingSegment(Segment*)),
+                this, TQ_SLOT(slotNewMIDIRecordingSegment(Segment*)));
+        connect(doc, TQ_SIGNAL(newAudioRecordingSegment(Segment*)),
+                this, TQ_SLOT(slotNewAudioRecordingSegment(Segment*)));
+        //     connect(doc, TQ_SIGNAL(recordMIDISegmentUpdated(Segment*, timeT)),
+        //             this, TQ_SLOT(slotRecordMIDISegmentUpdated(Segment*, timeT)));
+        connect(doc, TQ_SIGNAL(stoppedAudioRecording()),
+                this, TQ_SLOT(slotStoppedRecording()));
+        connect(doc, TQ_SIGNAL(stoppedMIDIRecording()),
+                this, TQ_SLOT(slotStoppedRecording()));
+        connect(doc, TQ_SIGNAL(audioFileFinalized(Segment*)),
+                getModel(), TQ_SLOT(slotAudioFileFinalized(Segment*)));
     }
     
     CompositionModelImpl* cmi = dynamic_cast<CompositionModelImpl*>(model);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index ae2c2aa..0ea6a03 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -61,15 +61,15 @@ SegmentMover::SegmentMover(CompositionView *c, RosegardenGUIDoc *d)
 void SegmentMover::ready()
 {
     m_canvas->viewport()->setCursor(TQt::sizeAllCursor);
-    connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-            this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+            this, TQ_SLOT(slotCanvasScrolled(int, int)));
     setBasicContextHelp();
 }
 
 void SegmentMover::stow()
 {
-    disconnect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-               this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    disconnect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+               this, TQ_SLOT(slotCanvasScrolled(int, int)));
 }
 
 void SegmentMover::slotCanvasScrolled(int newX, int newY)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
index 38bdf31..6eb58bc 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
@@ -63,15 +63,15 @@ SegmentPencil::SegmentPencil(CompositionView *c, RosegardenGUIDoc *d)
 void SegmentPencil::ready()
 {
     m_canvas->viewport()->setCursor(TQt::ibeamCursor);
-    connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-            this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+            this, TQ_SLOT(slotCanvasScrolled(int, int)));
     setContextHelpFor(TQPoint(0, 0));
 }
 
 void SegmentPencil::stow()
 {
-    disconnect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-               this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    disconnect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+               this, TQ_SLOT(slotCanvasScrolled(int, int)));
 }
 
 void SegmentPencil::slotCanvasScrolled(int newX, int newY)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
index 505ce3e..4b3406f 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
@@ -68,15 +68,15 @@ SegmentResizer::SegmentResizer(CompositionView *c, RosegardenGUIDoc *d,
 void SegmentResizer::ready()
 {
     m_canvas->viewport()->setCursor(TQt::sizeHorCursor);
-    connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-            this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+            this, TQ_SLOT(slotCanvasScrolled(int, int)));
     setBasicContextHelp(false);
 }
 
 void SegmentResizer::stow()
 {
-    disconnect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-               this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    disconnect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+               this, TQ_SLOT(slotCanvasScrolled(int, int)));
 }
 
 void SegmentResizer::slotCanvasScrolled(int newX, int newY)
@@ -177,10 +177,10 @@ void SegmentResizer::handleMouseButtonRelease(TQMouseEvent *e)
 
                     progressDlg.setLabel(i18n("Generating audio preview..."));
                     command->disconnectProgressDialog(&progressDlg);
-                    connect(&m_doc->getAudioFileManager(), TQT_SIGNAL(setProgress(int)),
-                            progressDlg.progressBar(), TQT_SLOT(setValue(int)));
-                    connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
-                            &m_doc->getAudioFileManager(), TQT_SLOT(slotStopPreview()));
+                    connect(&m_doc->getAudioFileManager(), TQ_SIGNAL(setProgress(int)),
+                            progressDlg.progressBar(), TQ_SLOT(setValue(int)));
+                    connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+                            &m_doc->getAudioFileManager(), TQ_SLOT(slotStopPreview()));
 
                     int fid = command->getNewAudioFileId();
                     if (fid >= 0) {
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index cb20975..a15a6c9 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -74,8 +74,8 @@ SegmentSelector::~SegmentSelector()
 void SegmentSelector::ready()
 {
     m_canvas->viewport()->setCursor(TQt::arrowCursor);
-    connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
-            this, TQT_SLOT(slotCanvasScrolled(int, int)));
+    connect(m_canvas, TQ_SIGNAL(contentsMoving (int, int)),
+            this, TQ_SLOT(slotCanvasScrolled(int, int)));
     setContextHelp(i18n("Click and drag to select segments"));
 }