Remove various '#define' strings - part 6

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

1 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 8f527d6..1ff9dc0 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -169,21 +169,21 @@ EventView::EventView(RosegardenGUIDoc *doc,
         layout->addWidget(m_triggerName, 0, 1);
         TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
         layout->addWidget(editButton, 0, 2);
-        connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName()));
+        connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerName()));
 
         layout->addWidget(new TQLabel(i18n("Base pitch:  "), frame), 1, 0);
         m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
         layout->addWidget(m_triggerPitch, 1, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
         layout->addWidget(editButton, 1, 2);
-        connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch()));
+        connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerPitch()));
 
         layout->addWidget(new TQLabel(i18n("Base velocity:  "), frame), 2, 0);
         m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
         layout->addWidget(m_triggerVelocity, 2, 1);
         editButton = new TQPushButton(i18n("edit"), frame);
         layout->addWidget(editButton, 2, 2);
-        connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerVelocity()));
+        connect(editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditTriggerVelocity()));
 
         /*!!! Comment out these two options, which are not yet used
           anywhere else -- intended for use with library ornaments, not
@@ -209,11 +209,11 @@ EventView::EventView(RosegardenGUIDoc *doc,
             adjust->setCurrentItem(2);
         }
 
-        connect(adjust, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerTimeAdjustChanged(int)));
+        connect(adjust, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTriggerTimeAdjustChanged(int)));
             
         TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
         retune->setChecked(rec->getDefaultRetune());
-        connect(retune, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerRetuneChanged()));
+        connect(retune, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTriggerRetuneChanged()));
         layout->addMultiCellWidget(retune, 4, 4, 1, 2);
 
         */
@@ -1118,41 +1118,41 @@ EventView::setupActions()
     TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
     TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/event-insert.png"));
 
-    new TDEAction(i18n("&Insert Event"), icon, Key_I, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Insert Event"), icon, Key_I, this,
                 TQT_SLOT(slotEditInsert()), actionCollection(),
                 "insert");
 
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-delete.png");
     icon = TQIconSet(pixmap);
 
-    new TDEAction(i18n("&Delete Event"), icon, Key_Delete, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Delete Event"), icon, Key_Delete, this,
                 TQT_SLOT(slotEditDelete()), actionCollection(),
                 "delete");
 
     pixmap.load(pixmapDir + "/toolbar/event-edit.png");
     icon = TQIconSet(pixmap);
 
-    new TDEAction(i18n("&Edit Event"), icon, Key_E, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Edit Event"), icon, Key_E, this,
                 TQT_SLOT(slotEditEvent()), actionCollection(),
                 "edit_simple");
 
     pixmap.load(pixmapDir + "/toolbar/event-edit-advanced.png");
     icon = TQIconSet(pixmap);
 
-    new TDEAction(i18n("&Advanced Event Editor"), icon, Key_A, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Advanced Event Editor"), icon, Key_A, this,
                 TQT_SLOT(slotEditEventAdvanced()), actionCollection(),
                 "edit_advanced");
 
     //    icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm"));
-    new TDEAction(i18n("&Filter Selection"), "filter", Key_F, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Filter Selection"), "filter", Key_F, this,
                 TQT_SLOT(slotFilterSelection()), actionCollection(),
                 "filter_selection");
 
-    new TDEAction(i18n("Select &All"), Key_A + CTRL, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Select &All"), Key_A + CTRL, this,
                 TQT_SLOT(slotSelectAll()), actionCollection(),
                 "select_all");
 
-    new TDEAction(i18n("Clear Selection"), Key_Escape, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Clear Selection"), Key_Escape, this,
                 TQT_SLOT(slotClearSelection()), actionCollection(),
                 "clear_selection");
 
@@ -1164,7 +1164,7 @@ EventView::setupActions()
     pixmap.load(pixmapDir + "/toolbar/time-musical.png");
     icon = TQIconSet(pixmap);
 
-    action = new TDERadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
+    action = new TDERadioAction(i18n("&Musical Times"), icon, 0, this,
                               TQT_SLOT(slotMusicalTime()),
                               actionCollection(), "time_musical");
     action->setExclusiveGroup("timeMode");
@@ -1174,7 +1174,7 @@ EventView::setupActions()
     pixmap.load(pixmapDir + "/toolbar/time-real.png");
     icon = TQIconSet(pixmap);
 
-    action = new TDERadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
+    action = new TDERadioAction(i18n("&Real Times"), icon, 0, this,
                               TQT_SLOT(slotRealTime()),
                               actionCollection(), "time_real");
     action->setExclusiveGroup("timeMode");
@@ -1184,7 +1184,7 @@ EventView::setupActions()
     pixmap.load(pixmapDir + "/toolbar/time-raw.png");
     icon = TQIconSet(pixmap);
 
-    action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
+    action = new TDERadioAction(i18n("Ra&w Times"), icon, 0, this,
                               TQT_SLOT(slotRawTime()),
                               actionCollection(), "time_raw");
     action->setExclusiveGroup("timeMode");