Replace various '#define' strings - part 6

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

4 files changed, 27 insertions, 27 deletions

diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp
index d701ccb4..51f8fc40 100644
--- a/tdemid/kdisptext.cpp
+++ b/tdemid/kdisptext.cpp
@@ -122,7 +122,7 @@ void KDisplayText::ClearEv(bool totally)
   RemoveLinkedList();
   if (totally)
   {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     autoscrollv=0;
     resizeContents(0,0);
     viewport()->repaint(TRUE);
@@ -425,7 +425,7 @@ void KDisplayText::PaintIn(int type)
 	autoscrollv+=qfmetr->lineSpacing();
 	if (b) startTimer(100);
 	else {
-	   TQT_TQOBJECT(this)->killTimers();
+	   this->killTimers();
 	   startTimer(100/(autoscrollv/qfmetr->lineSpacing()+1));
 	}
 	}
@@ -484,7 +484,7 @@ void KDisplayText::gotomsec(ulong i)
             
         }
         
-	TQT_TQOBJECT(this)->killTimers();
+	this->killTimers();
 	autoscrollv=0;
         setContentsPos(0,first_line->ypos);
         viewport()->repaint();
diff --git a/tdemid/klcdnumber.cpp b/tdemid/klcdnumber.cpp
index 3fdf80c4..1d4bab00 100644
--- a/tdemid/klcdnumber.cpp
+++ b/tdemid/klcdnumber.cpp
@@ -299,7 +299,7 @@ void KLCDNumber::mousePressEvent (TQMouseEvent *e)
 
 void KLCDNumber::timerEvent(TQTimerEvent *)
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     doubleclicked=false;
 
 }
diff --git a/tdemid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp
index 34551627..0e2a1d3c 100644
--- a/tdemid/ktrianglebutton.cpp
+++ b/tdemid/ktrianglebutton.cpp
@@ -144,17 +144,17 @@ void KTriangleButton::mouseReleaseEvent(TQMouseEvent *e)
 
 void KTriangleButton::timerEvent(TQTimerEvent *)
 {
-    if (!usingTimer) {TQT_TQOBJECT(this)->killTimers();return;};
+    if (!usingTimer) {this->killTimers();return;};
     if (timeCount==0)
     {
         timeCount++;
-        TQT_TQOBJECT(this)->killTimers();
+        this->killTimers();
         startTimer(120);
     } else
         if (timeCount==30)
         {
             timeCount=-1;
-            TQT_TQOBJECT(this)->killTimers();
+            this->killTimers();
             startTimer(80);
         }
     else if (timeCount>0) timeCount++;
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index fbfaa4c0..609be7dd 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -68,7 +68,7 @@ tdemidFrame::tdemidFrame(const char *name)
 /*
     kKeysAccel=new TDEAccel(this);
     kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
-    kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
+    kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed()));
     kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
     kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop()));
     kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
@@ -86,34 +86,34 @@ tdemidFrame::tdemidFrame(const char *name)
 
     kKeysAccel->readSettings();
 */
-    KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
-    (void)new TDEAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
+    KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection());
+    (void)new TDEAction(i18n("&Save Lyrics..."), 0, this,
 	TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
-    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
 
     (void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
-		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
-    (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
+		tdemidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play");
+    (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, tdemidclient,
 			TQT_SLOT(slotPause()), actionCollection(), "song_pause");
     (void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace,
-		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+		tdemidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop");
 
     (void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left,
-		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
+		tdemidclient, TQT_SLOT(slotPrevSong()), actionCollection(),
 		"song_previous");
     (void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right,
-		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(),
+		tdemidclient, TQT_SLOT(slotNextSong()), actionCollection(),
 		"song_next");
-    (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
+    (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()),
 		actionCollection(), "song_loop");
 
-    (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
+    (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, tdemidclient,
 		TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
 
-    (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
+    (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, tdemidclient,
 		TQT_SLOT(slotForward()), actionCollection(), "song_forward");
 
-    (void)new TDEAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
+    (void)new TDEAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()),
 		actionCollection(), "collect_organize");
 
     TQStringList playmodes;
@@ -125,7 +125,7 @@ tdemidFrame::tdemidFrame(const char *name)
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
     act->setItems(playmodes);
 
-    (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
+    (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, this,
 	TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
 
     playmodes.clear();
@@ -147,29 +147,29 @@ tdemidFrame::tdemidFrame(const char *name)
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
     act->setItems(playmodes);
 
-    (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
+    (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, this,
 		TQT_SLOT(options_AutomaticText()), actionCollection(),
 		"option_automatictext");
 
     TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
-		0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+		0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
 		"toggle_volumebar");
     togact->setCheckedState(i18n("Hide &Volume Bar"));
 
     togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
-		0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(),
+		0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(),
 		"toggle_channelview");
     togact->setCheckedState(i18n("Hide &Channel View"));
 
-    (void)new TDEAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("Channel View &Options..."), 0, this,
 		TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
 		"channelview_options");
 
-    (void)new TDEAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("&Font Change..."), 0, this,
 		TQT_SLOT(options_FontChange()), actionCollection(),
 		"change_font");
 
-    (void)new TDEAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("MIDI &Setup..."), 0, this,
 		TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");