Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e9f46130c2656aaf299d8793556310c9bf95daee)

1 files changed, 35 insertions, 35 deletions

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);