Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

5 files changed, 58 insertions, 58 deletions

diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index aac1f16..eb58cf9 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -88,8 +88,8 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
 
     m_compositionRefreshStatusId = m_composition->getNewRefreshStatusId();
 
-    TQObject::connect(doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-                     this, TQT_SLOT(update()));
+    TQObject::connect(doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+                     this, TQ_SLOT(update()));
 
     TQToolTip::add
         (this, i18n("Chord name ruler.\nTurn it on and off from the Settings->Rulers menu."));
@@ -129,8 +129,8 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
 
     m_compositionRefreshStatusId = m_composition->getNewRefreshStatusId();
 
-    TQObject::connect(doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-                     this, TQT_SLOT(update()));
+    TQObject::connect(doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+                     this, TQ_SLOT(update()));
 
     for (std::vector<Segment *>::iterator i = segments.begin();
             i != segments.end(); ++i) {
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 57a2d17..e98a1cf 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -86,8 +86,8 @@ ControlRuler::ControlRuler(Segment *segment,
 
     setFixedHeight(sizeHint().height());
 
-    connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
-            m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+    connect(this, TQ_SIGNAL(stateChange(const TQString&, bool)),
+            m_parentEditView, TQ_SLOT(slotStateChanged(const TQString&, bool)));
 
     m_numberFloat = new TextFloat(this);
     m_numberFloat->hide();
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 4e40728..977f2d3 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -96,21 +96,21 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
     new TDEAction(i18n("Insert Marker"), icon, 0, this,
-             TQT_SLOT(slotInsertMarkerHere()), actionCollection(),
+             TQ_SLOT(slotInsertMarkerHere()), actionCollection(),
              "insert_marker_here");
     
     new TDEAction(i18n("Insert Marker at Playback Position"), 0, this,
-             TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
+             TQ_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
              "insert_marker_at_pointer");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
     new TDEAction(i18n("Delete Marker"), icon, 0, this,
-             TQT_SLOT(slotDeleteMarker()), actionCollection(),
+             TQ_SLOT(slotDeleteMarker()), actionCollection(),
              "delete_marker");
     
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
     new TDEAction(i18n("Edit Marker..."), icon, 0, this,
-                 TQT_SLOT(slotEditMarker()), actionCollection(),
+                 TQ_SLOT(slotEditMarker()), actionCollection(),
                  "edit_marker");
 
     TQToolTip::add
diff --git a/src/gui/rulers/StandardRuler.cpp b/src/gui/rulers/StandardRuler.cpp
index 52f9ebb..e0489a7 100644
--- a/src/gui/rulers/StandardRuler.cpp
+++ b/src/gui/rulers/StandardRuler.cpp
@@ -74,8 +74,8 @@ StandardRuler::StandardRuler(RosegardenGUIDoc *doc,
     }
 
     TQObject::connect
-        (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-         this, TQT_SLOT(update()));
+        (doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+         this, TQ_SLOT(update()));
 
 }
 
@@ -94,49 +94,49 @@ void StandardRuler::connectRulerToDocPointer(RosegardenGUIDoc *doc)
     // so they are re-emitted from the loop ruler by this widget
     //
     TQObject::connect
-    (m_loopRuler, TQT_SIGNAL(setPointerPosition(timeT)),
-     doc, TQT_SLOT(slotSetPointerPosition(timeT)));
+    (m_loopRuler, TQ_SIGNAL(setPointerPosition(timeT)),
+     doc, TQ_SLOT(slotSetPointerPosition(timeT)));
 
     TQObject::connect
-    (m_hButtonBar, TQT_SIGNAL(setPointerPosition(timeT)),
-     doc, TQT_SLOT(slotSetPointerPosition(timeT)));
+    (m_hButtonBar, TQ_SIGNAL(setPointerPosition(timeT)),
+     doc, TQ_SLOT(slotSetPointerPosition(timeT)));
 
     TQObject::connect
-    (m_hButtonBar, TQT_SIGNAL(editMarkers()),
-     RosegardenGUIApp::self(), TQT_SLOT(slotEditMarkers()));
+    (m_hButtonBar, TQ_SIGNAL(editMarkers()),
+     RosegardenGUIApp::self(), TQ_SLOT(slotEditMarkers()));
 
     TQObject::connect
-    (m_hButtonBar, TQT_SIGNAL(addMarker(timeT)),
-     RosegardenGUIApp::self(), TQT_SLOT(slotAddMarker(timeT)));
+    (m_hButtonBar, TQ_SIGNAL(addMarker(timeT)),
+     RosegardenGUIApp::self(), TQ_SLOT(slotAddMarker(timeT)));
 
     TQObject::connect
-    (m_hButtonBar, TQT_SIGNAL(deleteMarker(int, timeT, TQString, TQString)),
-     RosegardenGUIApp::self(), TQT_SLOT(slotDeleteMarker(int, timeT, TQString, TQString)));
+    (m_hButtonBar, TQ_SIGNAL(deleteMarker(int, timeT, TQString, TQString)),
+     RosegardenGUIApp::self(), TQ_SLOT(slotDeleteMarker(int, timeT, TQString, TQString)));
 
     TQObject::connect
-    (m_loopRuler, TQT_SIGNAL(dragPointerToPosition(timeT)),
-     this, TQT_SIGNAL(dragPointerToPosition(timeT)));
+    (m_loopRuler, TQ_SIGNAL(dragPointerToPosition(timeT)),
+     this, TQ_SIGNAL(dragPointerToPosition(timeT)));
 
     TQObject::connect
-    (m_loopRuler, TQT_SIGNAL(dragLoopToPosition(timeT)),
-     this, TQT_SIGNAL(dragLoopToPosition(timeT)));
+    (m_loopRuler, TQ_SIGNAL(dragLoopToPosition(timeT)),
+     this, TQ_SIGNAL(dragLoopToPosition(timeT)));
 
     TQObject::connect
-    (m_loopRuler, TQT_SIGNAL(setPlayPosition(timeT)),
-     RosegardenGUIApp::self(), TQT_SLOT(slotSetPlayPosition(timeT)));
+    (m_loopRuler, TQ_SIGNAL(setPlayPosition(timeT)),
+     RosegardenGUIApp::self(), TQ_SLOT(slotSetPlayPosition(timeT)));
 
     TQObject::connect
-    (m_hButtonBar, TQT_SIGNAL(setLoop(timeT, timeT)),
-     doc, TQT_SLOT(slotSetLoop(timeT, timeT)));
+    (m_hButtonBar, TQ_SIGNAL(setLoop(timeT, timeT)),
+     doc, TQ_SLOT(slotSetLoop(timeT, timeT)));
 
     TQObject::connect
-    (m_loopRuler, TQT_SIGNAL(setLoop(timeT, timeT)),
-     doc, TQT_SLOT(slotSetLoop(timeT, timeT)));
+    (m_loopRuler, TQ_SIGNAL(setLoop(timeT, timeT)),
+     doc, TQ_SLOT(slotSetLoop(timeT, timeT)));
 
     TQObject::connect
-    (doc, TQT_SIGNAL(loopChanged(timeT, timeT)),
+    (doc, TQ_SIGNAL(loopChanged(timeT, timeT)),
      m_loopRuler,
-     TQT_SLOT(slotSetLoopMarker(timeT, timeT)));
+     TQ_SLOT(slotSetLoopMarker(timeT, timeT)));
 
     m_loopRuler->setBackgroundColor(GUIPalette::getColour(GUIPalette::PointerRuler));
 }
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index c987d57..d62aabf 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -115,45 +115,45 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
     setBackgroundMode(TQt::NoBackground);
 
     TQObject::connect
-    (doc->getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-     this, TQT_SLOT(update()));
+    (doc->getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+     this, TQ_SLOT(update()));
 
     TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQIconSet icon;
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
     new TDEAction(i18n("Insert Tempo Change"), icon, 0, this,
-                 TQT_SLOT(slotInsertTempoHere()), actionCollection(),
+                 TQ_SLOT(slotInsertTempoHere()), actionCollection(),
                  "insert_tempo_here");
 
     new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, this,
-                 TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(),
+                 TQ_SLOT(slotInsertTempoAtPointer()), actionCollection(),
                  "insert_tempo_at_pointer");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
     new TDEAction(i18n("Delete Tempo Change"), icon, 0, this,
-                 TQT_SLOT(slotDeleteTempoChange()), actionCollection(),
+                 TQ_SLOT(slotDeleteTempoChange()), actionCollection(),
                  "delete_tempo");
 
     new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, this,
-                 TQT_SLOT(slotRampToNext()), actionCollection(),
+                 TQ_SLOT(slotRampToNext()), actionCollection(),
                  "ramp_to_next");
 
     new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, this,
-                 TQT_SLOT(slotUnramp()), actionCollection(),
+                 TQ_SLOT(slotUnramp()), actionCollection(),
                  "unramp");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
     new TDEAction(i18n("Edit Tempo..."), icon, 0, this,
-                 TQT_SLOT(slotEditTempo()), actionCollection(),
+                 TQ_SLOT(slotEditTempo()), actionCollection(),
                  "edit_tempo");
 
     new TDEAction(i18n("Edit Time Signature..."), 0, 0, this,
-                 TQT_SLOT(slotEditTimeSignature()), actionCollection(),
+                 TQ_SLOT(slotEditTimeSignature()), actionCollection(),
                  "edit_time_signature");
 
     new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, this,
-                 TQT_SLOT(slotEditTempos()), actionCollection(),
+                 TQ_SLOT(slotEditTempos()), actionCollection(),
                  "edit_tempos");
 
     setMouseTracking(false);
@@ -172,47 +172,47 @@ void
 TempoRuler::connectSignals()
 {
     connect(this,
-            TQT_SIGNAL(doubleClicked(timeT)),
+            TQ_SIGNAL(doubleClicked(timeT)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotEditTempos(timeT)));
+            TQ_SLOT(slotEditTempos(timeT)));
 
     connect(this,
-            TQT_SIGNAL(changeTempo(timeT,
+            TQ_SIGNAL(changeTempo(timeT,
                                tempoT,
                                tempoT,
                                TempoDialog::TempoDialogAction)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotChangeTempo(timeT,
+            TQ_SLOT(slotChangeTempo(timeT,
                                  tempoT,
                                  tempoT,
                                  TempoDialog::TempoDialogAction)));
 
     connect(this,
-            TQT_SIGNAL(moveTempo(timeT,
+            TQ_SIGNAL(moveTempo(timeT,
                              timeT)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotMoveTempo(timeT,
+            TQ_SLOT(slotMoveTempo(timeT,
                                timeT)));
 
     connect(this,
-            TQT_SIGNAL(deleteTempo(timeT)),
+            TQ_SIGNAL(deleteTempo(timeT)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotDeleteTempo(timeT)));
+            TQ_SLOT(slotDeleteTempo(timeT)));
 
     connect(this,
-            TQT_SIGNAL(editTempo(timeT)),
+            TQ_SIGNAL(editTempo(timeT)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotEditTempo(timeT)));
+            TQ_SLOT(slotEditTempo(timeT)));
 
     connect(this,
-            TQT_SIGNAL(editTimeSignature(timeT)),
+            TQ_SIGNAL(editTimeSignature(timeT)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotEditTimeSignature(timeT)));
+            TQ_SLOT(slotEditTimeSignature(timeT)));
 
     connect(this,
-            TQT_SIGNAL(editTempos(timeT)),
+            TQ_SIGNAL(editTempos(timeT)),
             RosegardenGUIApp::self(),
-            TQT_SLOT(slotEditTempos(timeT)));
+            TQ_SLOT(slotEditTempos(timeT)));
 }
 
 void