Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 88 insertions, 88 deletions

diff --git a/src/gui/general/BaseToolBox.cpp b/src/gui/general/BaseToolBox.cpp
index a6b210a..93904ad 100644
--- a/src/gui/general/BaseToolBox.cpp
+++ b/src/gui/general/BaseToolBox.cpp
@@ -46,8 +46,8 @@ BaseTool* BaseToolBox::getTool(const TQString& toolName)
 
     if (!tool) tool = createTool(toolName);
 
-    connect(tool, TQT_SIGNAL(showContextHelp(const TQString &)),
-            this, TQT_SIGNAL(showContextHelp(const TQString &)));
+    connect(tool, TQ_SIGNAL(showContextHelp(const TQString &)),
+            this, TQ_SIGNAL(showContextHelp(const TQString &)));
     
     return tool;
 }
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index c9b01f0..24ab509 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -133,8 +133,8 @@ EditView::EditView(RosegardenGUIDoc *doc,
 {
     m_controlRulers->setHoverCloseButton(true);
     m_controlRulers->setHoverCloseButtonDelayed(false);
-    connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)),
-            this, TQT_SLOT(slotRemoveControlRuler(TQWidget*)));
+    connect(m_controlRulers, TQ_SIGNAL(closeRequest(TQWidget*)),
+            this, TQ_SLOT(slotRemoveControlRuler(TQWidget*)));
 
     (dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop);
 
@@ -281,10 +281,10 @@ void EditView::setTopStandardRuler(StandardRuler* w, TQWidget *leftBox)
     m_grid->addLayout(gl, TOPBARBUTTONS_ROW, m_mainCol);
 
     if (m_canvasView) {
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-                m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-                m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+                m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+                m_topStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
     }
 }
 
@@ -296,10 +296,10 @@ void EditView::setBottomStandardRuler(StandardRuler* w)
     //     m_bottomBox->insertWidget(0, w);
 
     if (m_canvasView) {
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-                m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-                m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+                m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+                m_bottomStandardRuler, TQ_SLOT(slotScrollHoriz(int)));
     }
 }
 
@@ -343,10 +343,10 @@ void EditView::addRuler(TQWidget* w)
     m_rulerBox->addWidget(w);
 
     if (m_canvasView) {
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-                w, TQT_SLOT(slotScrollHoriz(int)));
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-                w, TQT_SLOT(slotScrollHoriz(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+                w, TQ_SLOT(slotScrollHoriz(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+                w, TQ_SLOT(slotScrollHoriz(int)));
     }
 }
 
@@ -363,14 +363,14 @@ void EditView::addControlRuler(ControlRuler* ruler)
     m_controlRulers->showPage(ruler);
 
     if (m_canvasView) {
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)),
-                ruler->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)));
-        connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)),
-                ruler->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+                ruler->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)));
+        connect(m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)),
+                ruler->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)));
     }
 
-    connect(ruler, TQT_SIGNAL(stateChange(const TQString&, bool)),
-            this, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+    connect(ruler, TQ_SIGNAL(stateChange(const TQString&, bool)),
+            this, TQ_SLOT(slotStateChanged(const TQString&, bool)));
 
     stateChanged("have_control_ruler", KXMLGUIClient::StateReverse);
 }
@@ -424,10 +424,10 @@ void EditView::setCanvasView(RosegardenCanvasView *canvasView)
     //     m_horizontalScrollBar->setSteps(m_canvasView->horizontalScrollBar()->lineStep(),
     //                                     m_canvasView->horizontalScrollBar()->pageStep());
 
-    //     connect(m_horizontalScrollBar, TQT_SIGNAL(valueChanged(int)),
-    //             m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)));
-    //     connect(m_horizontalScrollBar, TQT_SIGNAL(sliderMoved(int)),
-    //             m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)));
+    //     connect(m_horizontalScrollBar, TQ_SIGNAL(valueChanged(int)),
+    //             m_canvasView->horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)));
+    //     connect(m_horizontalScrollBar, TQ_SIGNAL(sliderMoved(int)),
+    //             m_canvasView->horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)));
 
 }
 
@@ -726,132 +726,132 @@ EditView::setupActions()
     TQIconSet icon = TQIconSet(pixmap);
     new TDEAction(AddTempoChangeCommand::getGlobalName(),
 		icon, 0,
-		this, TQT_SLOT(slotAddTempo()),
+		this, TQ_SLOT(slotAddTempo()),
 		actionCollection(), "add_tempo");
 
     pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png");
     icon = TQIconSet(pixmap);
     new TDEAction(AddTimeSignatureCommand::getGlobalName(),
 		icon, 0,
-		this, TQT_SLOT(slotAddTimeSignature()),
+		this, TQ_SLOT(slotAddTimeSignature()),
 		actionCollection(), "add_time_signature");
 
     //
     // Transforms
     //
     new TDEAction(i18n("&Halve Durations"), Key_H + CTRL, this,
-                TQT_SLOT(slotHalveDurations()), actionCollection(),
+                TQ_SLOT(slotHalveDurations()), actionCollection(),
                 "halve_durations");
 
     new TDEAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, this,
-                TQT_SLOT(slotDoubleDurations()), actionCollection(),
+                TQ_SLOT(slotDoubleDurations()), actionCollection(),
                 "double_durations");
 
     new TDEAction(RescaleCommand::getGlobalName(), 0, this,
-                TQT_SLOT(slotRescale()), actionCollection(),
+                TQ_SLOT(slotRescale()), actionCollection(),
                 "rescale");
 
     new TDEAction(TransposeCommand::getGlobalName(1), 0,
                 Key_Up, this,
-                TQT_SLOT(slotTransposeUp()), actionCollection(),
+                TQ_SLOT(slotTransposeUp()), actionCollection(),
                 "transpose_up");
 
     new TDEAction(TransposeCommand::getGlobalName(12), 0,
                 Key_Up + CTRL, this,
-                TQT_SLOT(slotTransposeUpOctave()), actionCollection(),
+                TQ_SLOT(slotTransposeUpOctave()), actionCollection(),
                 "transpose_up_octave");
 
     new TDEAction(TransposeCommand::getGlobalName( -1), 0,
                 Key_Down, this,
-                TQT_SLOT(slotTransposeDown()), actionCollection(),
+                TQ_SLOT(slotTransposeDown()), actionCollection(),
                 "transpose_down");
 
     new TDEAction(TransposeCommand::getGlobalName( -12), 0,
                 Key_Down + CTRL, this,
-                TQT_SLOT(slotTransposeDownOctave()), actionCollection(),
+                TQ_SLOT(slotTransposeDownOctave()), actionCollection(),
                 "transpose_down_octave");
 
     new TDEAction(TransposeCommand::getGlobalName(0), 0, this,
-                TQT_SLOT(slotTranspose()), actionCollection(),
+                TQ_SLOT(slotTranspose()), actionCollection(),
                 "general_transpose");
 
     new TDEAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, this,
-                TQT_SLOT(slotDiatonicTranspose()), actionCollection(),
+                TQ_SLOT(slotDiatonicTranspose()), actionCollection(),
                 "general_diatonic_transpose");
 
     new TDEAction(InvertCommand::getGlobalName(0), 0, this,
-                TQT_SLOT(slotInvert()), actionCollection(),
+                TQ_SLOT(slotInvert()), actionCollection(),
                 "invert");
 
     new TDEAction(RetrogradeCommand::getGlobalName(0), 0, this,
-                TQT_SLOT(slotRetrograde()), actionCollection(),
+                TQ_SLOT(slotRetrograde()), actionCollection(),
                 "retrograde");
 
     new TDEAction(RetrogradeInvertCommand::getGlobalName(0), 0, this,
-                TQT_SLOT(slotRetrogradeInvert()), actionCollection(),
+                TQ_SLOT(slotRetrogradeInvert()), actionCollection(),
                 "retrograde_invert");
 
     new TDEAction(i18n("Jog &Left"), Key_Left + ALT, this,
-                TQT_SLOT(slotJogLeft()), actionCollection(),
+                TQ_SLOT(slotJogLeft()), actionCollection(),
                 "jog_left");
 
     new TDEAction(i18n("Jog &Right"), Key_Right + ALT, this,
-                TQT_SLOT(slotJogRight()), actionCollection(),
+                TQ_SLOT(slotJogRight()), actionCollection(),
                 "jog_right");
 
     // Control rulers
     //
     new TDEAction(i18n("Show Velocity Property Ruler"), 0, this,
-                TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(),
+                TQ_SLOT(slotShowVelocityControlRuler()), actionCollection(),
                 "show_velocity_control_ruler");
 
     /*
     new TDEAction(i18n("Show Controllers Events Ruler"), 0, this,
-                TQT_SLOT(slotShowControllerEventsRuler()), actionCollection(),
+                TQ_SLOT(slotShowControllerEventsRuler()), actionCollection(),
                 "show_controller_events_ruler");
                 */
 
     // Disabled for now
     //
     //     new TDEAction(i18n("Add Control Ruler..."), 0, this,
-    //                 TQT_SLOT(slotShowPropertyControlRuler()), actionCollection(),
+    //                 TQ_SLOT(slotShowPropertyControlRuler()), actionCollection(),
     //                 "add_control_ruler");
 
     //
     // Control Ruler context menu
     //
     new TDEAction(i18n("Insert item"), 0, this,
-                TQT_SLOT(slotInsertControlRulerItem()), actionCollection(),
+                TQ_SLOT(slotInsertControlRulerItem()), actionCollection(),
                 "insert_control_ruler_item");
 
     // This was on Key_Delete, but that conflicts with existing Delete commands
     // on individual edit views
     new TDEAction(i18n("Erase selected items"), 0, this,
-                TQT_SLOT(slotEraseControlRulerItem()), actionCollection(),
+                TQ_SLOT(slotEraseControlRulerItem()), actionCollection(),
                 "erase_control_ruler_item");
 
     new TDEAction(i18n("Clear ruler"), 0, this,
-                TQT_SLOT(slotClearControlRulerItem()), actionCollection(),
+                TQ_SLOT(slotClearControlRulerItem()), actionCollection(),
                 "clear_control_ruler_item");
 
     new TDEAction(i18n("Insert line of controllers"), 0, this,
-                TQT_SLOT(slotStartControlLineItem()), actionCollection(),
+                TQ_SLOT(slotStartControlLineItem()), actionCollection(),
                 "start_control_line_item");
 
     new TDEAction(i18n("Flip forward"), Key_BracketRight, this,
-                TQT_SLOT(slotFlipForwards()), actionCollection(),
+                TQ_SLOT(slotFlipForwards()), actionCollection(),
                 "flip_control_events_forward");
 
     new TDEAction(i18n("Flip backwards"), Key_BracketLeft, this,
-                TQT_SLOT(slotFlipBackwards()), actionCollection(),
+                TQ_SLOT(slotFlipBackwards()), actionCollection(),
                 "flip_control_events_back");
 
     new TDEAction(i18n("Draw property line"), 0, this,
-                TQT_SLOT(slotDrawPropertyLine()), actionCollection(),
+                TQ_SLOT(slotDrawPropertyLine()), actionCollection(),
                 "draw_property_line");
 
     new TDEAction(i18n("Select all property values"), 0, this,
-                TQT_SLOT(slotSelectAllProperties()), actionCollection(),
+                TQ_SLOT(slotSelectAllProperties()), actionCollection(),
                 "select_all_properties");
 }
 
@@ -901,8 +901,8 @@ EditView::setupAddControlRulerMenu()
             addControlRulerMenu->insertItem(itemStr, i++);
         }
 
-        connect(addControlRulerMenu, TQT_SIGNAL(activated(int)),
-                TQT_SLOT(slotAddControlRuler(int)));
+        connect(addControlRulerMenu, TQ_SIGNAL(activated(int)),
+                TQ_SLOT(slotAddControlRuler(int)));
     }
 
 }
@@ -1114,7 +1114,7 @@ EditView::createInsertPitchActionMenu()
                     new TDEAction
                     (flat.arg(notePitchNames[i]),
                      CTRL + SHIFT + notePitchKeys[octave][i],
-                     this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+                     this, TQ_SLOT(slotInsertNoteFromAction()), actionCollection(),
                      TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
@@ -1124,7 +1124,7 @@ EditView::createInsertPitchActionMenu()
                 new TDEAction
                 (notePitchNames[i],
                  notePitchKeys[octave][i],
-                 this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+                 this, TQ_SLOT(slotInsertNoteFromAction()), actionCollection(),
                  TQString("insert_%1%2").arg(i).arg(octaveSuffix).ascii());
 
             menu->insert(insertPitchAction);
@@ -1137,7 +1137,7 @@ EditView::createInsertPitchActionMenu()
                     new TDEAction
                     (sharp.arg(notePitchNames[i]),
                      SHIFT + notePitchKeys[octave][i],
-                     this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
+                     this, TQ_SLOT(slotInsertNoteFromAction()), actionCollection(),
                      TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
@@ -1218,12 +1218,12 @@ void EditView::slotAddTempo()
     TempoDialog tempoDlg(this, getDocument());
 
     connect(&tempoDlg,
-            TQT_SIGNAL(changeTempo(timeT,
+            TQ_SIGNAL(changeTempo(timeT,
                                tempoT,
                                tempoT,
                                TempoDialog::TempoDialogAction)),
             this,
-            TQT_SIGNAL(changeTempo(timeT,
+            TQ_SIGNAL(changeTempo(timeT,
                                tempoT,
                                tempoT,
                                TempoDialog::TempoDialogAction)));
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 59bd2f6..ca6bc80 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -118,12 +118,12 @@ EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
     m_doc->attachEditView(this);
 
     TQObject::connect
-    (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-     this, TQT_SLOT(update()));
+    (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+     this, TQ_SLOT(update()));
 
     TQObject::connect
-    (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-     this, TQT_SLOT(slotTestClipboard()));
+    (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+     this, TQ_SLOT(slotTestClipboard()));
 
     // create accelerators
     //
@@ -156,33 +156,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
 
     // Actions all edit views will have
 
-    KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()),
+    KStdAction::showToolbar(this, TQ_SLOT(slotToggleToolBar()),
                             actionCollection(), "options_show_toolbar");
 
-    KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
+    KStdAction::showStatusbar(this, TQ_SLOT(slotToggleStatusBar()),
                               actionCollection(), "options_show_statusbar");
 
     KStdAction::preferences(this,
-                            TQT_SLOT(slotConfigure()),
+                            TQ_SLOT(slotConfigure()),
                             actionCollection());
 
     KStdAction::keyBindings(this,
-                            TQT_SLOT(slotEditKeys()),
+                            TQ_SLOT(slotEditKeys()),
                             actionCollection());
 
     KStdAction::configureToolbars(this,
-                                  TQT_SLOT(slotEditToolbars()),
+                                  TQ_SLOT(slotEditToolbars()),
                                   actionCollection());
 
 
     // File menu
-    KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection());
-    KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection());
+    KStdAction::save (this, TQ_SIGNAL(saveFile()), actionCollection());
+    KStdAction::close(this, TQ_SLOT(slotCloseWindow()), actionCollection());
 
     if (haveClipboard) {
-        KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection());
-        KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
-        KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
+        KStdAction::cut (this, TQ_SLOT(slotEditCut()), actionCollection());
+        KStdAction::copy (this, TQ_SLOT(slotEditCopy()), actionCollection());
+        KStdAction::paste (this, TQ_SLOT(slotEditPaste()), actionCollection());
     }
 
     new TDEToolBarPopupAction(i18n("Und&o"),
@@ -202,33 +202,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
     TQIconSet icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInMatrix()), actionCollection(),
+                TQ_SLOT(slotOpenInMatrix()), actionCollection(),
                 "open_in_matrix");
 
     pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
     icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
+                TQ_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
                 "open_in_percussion_matrix");
 
     pixmap.load(pixmapDir + "/toolbar/notation.png");
     icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in &Notation Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInNotation()), actionCollection(),
+                TQ_SLOT(slotOpenInNotation()), actionCollection(),
                 "open_in_notation");
 
     pixmap.load(pixmapDir + "/toolbar/eventlist.png");
     icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in &Event List Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInEventList()), actionCollection(),
+                TQ_SLOT(slotOpenInEventList()), actionCollection(),
                 "open_in_event_list");
 
     new TDEAction(i18n("Set Segment Start Time..."), 0, this,
-                TQT_SLOT(slotSetSegmentStartTime()), actionCollection(),
+                TQ_SLOT(slotSetSegmentStartTime()), actionCollection(),
                 "set_segment_start");
 
     new TDEAction(i18n("Set Segment Duration..."), 0, this,
-                TQT_SLOT(slotSetSegmentDuration()), actionCollection(),
+                TQ_SLOT(slotSetSegmentDuration()), actionCollection(),
                 "set_segment_duration");
 
     // add undo and redo to edit menu and toolbar
@@ -254,8 +254,8 @@ void EditViewBase::slotEditToolbars()
 {
     KEditToolbar dlg(actionCollection(), getRCFileName());
 
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
-            TQT_SLOT(slotUpdateToolbars()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+            TQ_SLOT(slotUpdateToolbars()));
 
     dlg.exec();
 }
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index 3c9e100..9b02ef3 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -145,8 +145,8 @@ PresetHandlerDialog::initDialog()
     }
     	 
     
-    connect(m_categoryCombo, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(slotCategoryIndexChanged(int)));
+    connect(m_categoryCombo, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(slotCategoryIndexChanged(int)));
 }
 
 TQString
diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index a3afa8e..3df211a 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -58,8 +58,8 @@ RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas,
         m_autoScrolling(false)
 {
     setDragAutoScroll(true);
-    connect( &m_autoScrollTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( doAutoScroll() ) );
+    connect( &m_autoScrollTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( doAutoScroll() ) );
 }
 
 void RosegardenCanvasView::fitWidthToContents()
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index 2a0f1a4..a9b1d99 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -64,8 +64,8 @@ RosegardenScrollView::RosegardenScrollView(TQWidget* parent,
         m_autoScrolling(false)
 {
     setDragAutoScroll(true);
-    connect( &m_autoScrollTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( doAutoScroll() ) );
+    connect( &m_autoScrollTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( doAutoScroll() ) );
 }
 
 void RosegardenScrollView::setBottomFixedWidget(TQWidget* w)