Remove various '#define' strings - part 6

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

3 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index b65d7b0..1712618 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -272,7 +272,7 @@ void ControllerEventsRuler::insertControllerEvent()
         number = m_controller->getControllerValue();
     } else {
         bool ok = false;
-        TQIntValidator intValidator(0, 128, TQT_TQOBJECT(this));
+        TQIntValidator intValidator(0, 128, this);
         TQString res = KLineEditDlg::getText(i18n("Controller Event Number"), "0",
                                             &ok, this, &intValidator);
         if (ok)
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index ec7bdd8..4e40728 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -78,7 +78,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
     // Otherwise we'll end up adding all actions to the same
     // (document-level) action collection regardless of which window
     // we're in.
-    TQObject *probe = TQT_TQOBJECT(parent);
+    TQObject *probe = parent;
     while (probe && !dynamic_cast<TDEMainWindow *>(probe)) probe = probe->parent();
     if (probe) m_parentMainWindow = dynamic_cast<TDEMainWindow *>(probe);
 
@@ -95,21 +95,21 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
     // don't become more event-specific in future...
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
-    new TDEAction(i18n("Insert Marker"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Marker"), icon, 0, this,
              TQT_SLOT(slotInsertMarkerHere()), actionCollection(),
              "insert_marker_here");
     
-    new TDEAction(i18n("Insert Marker at Playback Position"), 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Marker at Playback Position"), 0, this,
              TQT_SLOT(slotInsertMarkerAtPointer()), actionCollection(),
              "insert_marker_at_pointer");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
-    new TDEAction(i18n("Delete Marker"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Delete Marker"), icon, 0, this,
              TQT_SLOT(slotDeleteMarker()), actionCollection(),
              "delete_marker");
     
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
-    new TDEAction(i18n("Edit Marker..."), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Edit Marker..."), icon, 0, this,
                  TQT_SLOT(slotEditMarker()), actionCollection(),
                  "edit_marker");
 
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 5f31a90..c987d57 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -122,37 +122,37 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
     TQIconSet icon;
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-insert-tempo.png"));
-    new TDEAction(i18n("Insert Tempo Change"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Tempo Change"), icon, 0, this,
                  TQT_SLOT(slotInsertTempoHere()), actionCollection(),
                  "insert_tempo_here");
 
-    new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Insert Tempo Change at Playback Position"), 0, 0, this,
                  TQT_SLOT(slotInsertTempoAtPointer()), actionCollection(),
                  "insert_tempo_at_pointer");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-delete.png"));
-    new TDEAction(i18n("Delete Tempo Change"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Delete Tempo Change"), icon, 0, this,
                  TQT_SLOT(slotDeleteTempoChange()), actionCollection(),
                  "delete_tempo");
 
-    new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Ramp Tempo to Next Tempo"), 0, 0, this,
                  TQT_SLOT(slotRampToNext()), actionCollection(),
                  "ramp_to_next");
 
-    new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Un-Ramp Tempo"), 0, 0, this,
                  TQT_SLOT(slotUnramp()), actionCollection(),
                  "unramp");
 
     icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/event-edit.png"));
-    new TDEAction(i18n("Edit Tempo..."), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Edit Tempo..."), icon, 0, this,
                  TQT_SLOT(slotEditTempo()), actionCollection(),
                  "edit_tempo");
 
-    new TDEAction(i18n("Edit Time Signature..."), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Edit Time Signature..."), 0, 0, this,
                  TQT_SLOT(slotEditTimeSignature()), actionCollection(),
                  "edit_time_signature");
 
-    new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Open Tempo and Time Signature Editor"), 0, 0, this,
                  TQT_SLOT(slotEditTempos()), actionCollection(),
                  "edit_tempos");