Replace various '#define' strings - part 6

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

1 files changed, 28 insertions, 28 deletions

diff --git a/juk/juk.cpp b/juk/juk.cpp
index c66c19fc..734d39b7 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -72,7 +72,7 @@ JuK::JuK(TQWidget *parent, const char *name) :
 
     SplashScreen::finishedLoading();
     TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache()));
-    TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs()));
+    TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs()));
 
     m_sliderAction->slotUpdateOrientation();
 }
@@ -112,15 +112,15 @@ void JuK::setupActions()
 {
     ActionCollection::actions()->setWidget(this);
 
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions());
-    KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions());
-    KStdAction::cut(TQT_TQOBJECT(kapp),   TQT_SLOT(cut()),   ActionCollection::actions());
-    KStdAction::copy(TQT_TQOBJECT(kapp),  TQT_SLOT(copy()),  ActionCollection::actions());
-    KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions());
-    KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions());
-    KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions());
+    KStdAction::quit(this, TQT_SLOT(slotQuit()), ActionCollection::actions());
+    KStdAction::undo(this, TQT_SLOT(slotUndo()), ActionCollection::actions());
+    KStdAction::cut(kapp,   TQT_SLOT(cut()),   ActionCollection::actions());
+    KStdAction::copy(kapp,  TQT_SLOT(copy()),  ActionCollection::actions());
+    KStdAction::paste(kapp, TQT_SLOT(paste()), ActionCollection::actions());
+    KStdAction::clear(kapp, TQT_SLOT(clear()), ActionCollection::actions());
+    KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), ActionCollection::actions());
 
-    new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
+    new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
 
     TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
     actionMenu->setDelayed(false);
@@ -138,12 +138,12 @@ void JuK::setupActions()
     connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
     actionMenu->insert(ka);
 
-    new TDEAction(i18n("&Play"),  "media-playback-start",  0, TQT_TQOBJECT(m_player), TQT_SLOT(play()),  ActionCollection::actions(), "play");
-    new TDEAction(i18n("P&ause"), "media-playback-pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
-    new TDEAction(i18n("&Stop"),  "media-playback-stop",  0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()),  ActionCollection::actions(), "stop");
+    new TDEAction(i18n("&Play"),  "media-playback-start",  0, m_player, TQT_SLOT(play()),  ActionCollection::actions(), "play");
+    new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQT_SLOT(pause()), ActionCollection::actions(), "pause");
+    new TDEAction(i18n("&Stop"),  "media-playback-stop",  0, m_player, TQT_SLOT(stop()),  ActionCollection::actions(), "stop");
 
-    new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
-    new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+    new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQT_SLOT(back()), ActionCollection::actions(), "back");
+    new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQT_SLOT(forward()), ActionCollection::actions(), "forward");
     new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist");
     TDEToggleAction *resizeColumnAction =
         new TDEToggleAction(i18n("&Resize Playlist Columns Manually"),
@@ -152,12 +152,12 @@ void JuK::setupActions()
 
     // the following are not visible by default
 
-    new TDEAction(i18n("Mute"),         "mute",        0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()),        ActionCollection::actions(), "mute");
-    new TDEAction(i18n("Volume Up"),    "volumeUp",    0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()),    ActionCollection::actions(), "volumeUp");
-    new TDEAction(i18n("Volume Down"),  "volumeDown",  0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()),  ActionCollection::actions(), "volumeDown");
-    new TDEAction(i18n("Play / Pause"), "playPause",   0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()),   ActionCollection::actions(), "playPause");
-    new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
-    new TDEAction(i18n("Seek Back"),    "seekBack",    0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()),    ActionCollection::actions(), "seekBack");
+    new TDEAction(i18n("Mute"),         "mute",        0, m_player, TQT_SLOT(mute()),        ActionCollection::actions(), "mute");
+    new TDEAction(i18n("Volume Up"),    "volumeUp",    0, m_player, TQT_SLOT(volumeUp()),    ActionCollection::actions(), "volumeUp");
+    new TDEAction(i18n("Volume Down"),  "volumeDown",  0, m_player, TQT_SLOT(volumeDown()),  ActionCollection::actions(), "volumeDown");
+    new TDEAction(i18n("Play / Pause"), "playPause",   0, m_player, TQT_SLOT(playPause()),   ActionCollection::actions(), "playPause");
+    new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
+    new TDEAction(i18n("Seek Back"),    "seekBack",    0, m_player, TQT_SLOT(seekBack()),    ActionCollection::actions(), "seekBack");
 
     //////////////////////////////////////////////////
     // settings menu
@@ -175,9 +175,9 @@ void JuK::setupActions()
 			  TDEShortcut(), ActionCollection::actions(), "dockOnClose");
     m_togglePopupsAction =
 	new TDEToggleAction(i18n("Popup &Track Announcement"),
-			  TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
+			  TDEShortcut(), this, 0, ActionCollection::actions(), "togglePopups");
     new TDEToggleAction(i18n("Save &Play Queue on Exit"),
-                      TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
+                      TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks");
 
     connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
 	    this, TQT_SLOT(slotToggleSystemTray(bool)));
@@ -188,13 +188,13 @@ void JuK::setupActions()
     if(m_outputSelectAction)
         m_outputSelectAction->setCurrentItem(0);
 
-    new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+    new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()),
 		ActionCollection::actions(), "tagGuesserConfig");
 
-    new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+    new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()),
 		ActionCollection::actions(), "fileRenamerConfig");
 
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
+    KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), ActionCollection::actions());
 
     //////////////////////////////////////////////////
     // just in the toolbar
@@ -213,7 +213,7 @@ void JuK::setupSystemTray()
 	m_toggleDockOnCloseAction->setEnabled(true);
 	m_togglePopupsAction->setEnabled(true);
 
-	connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
+	connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit()));
     }
     else {
 	m_systemTray = 0;
@@ -224,7 +224,7 @@ void JuK::setupSystemTray()
 
 void JuK::setupGlobalAccels()
 {
-    m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this));
+    m_accel = new TDEGlobalAccel(this);
 
     KeyDialog::insert(m_accel, "Play",        i18n("Play"),         action("play"),        TQT_SLOT(activate()));
     KeyDialog::insert(m_accel, "PlayPause",   i18n("Play / Pause"), action("playPause"),   TQT_SLOT(activate()));
@@ -236,7 +236,7 @@ void JuK::setupGlobalAccels()
     KeyDialog::insert(m_accel, "VolumeUp",    i18n("Volume Up"),    action("volumeUp"),    TQT_SLOT(activate()));
     KeyDialog::insert(m_accel, "VolumeDown",  i18n("Volume Down"),  action("volumeDown"),  TQT_SLOT(activate()));
     KeyDialog::insert(m_accel, "Mute",        i18n("Mute"),         action("mute"),        TQT_SLOT(activate()));
-    KeyDialog::insert(m_accel, "ShowHide",    i18n("Show / Hide"),  TQT_TQOBJECT(this),    TQT_SLOT(slotShowHide()));
+    KeyDialog::insert(m_accel, "ShowHide",    i18n("Show / Hide"),  this,    TQT_SLOT(slotShowHide()));
     KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate()));
 
     m_accel->setConfigGroup("Shortcuts");