Replace various '#define' strings - part 6

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

1 files changed, 34 insertions, 34 deletions

diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index df4eeabf..34e7c360 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   random_current      = random_list.begin();
 
   cddb = new KCDDB::Client();
-  connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), TQT_TQOBJECT(this), TQT_SLOT(lookupCDDBDone(CDDB::Result)));
+  connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result)));
 
 #if defined(BUILD_CDDA)
   audio_systems_list
@@ -139,11 +139,11 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
   /* FIXME check for return value */
   setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/);
-  connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned)));
-  connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned)));
-  connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackChanged(unsigned, unsigned)));
-  connect(m_cd, TQT_SIGNAL(discStopped()), TQT_TQOBJECT(this), TQT_SLOT(discStopped()));
-  connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), TQT_TQOBJECT(this), TQT_SLOT(discChanged(unsigned)));
+  connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned)));
+  connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned)));
+  connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), this, TQT_SLOT(trackChanged(unsigned, unsigned)));
+  connect(m_cd, TQT_SIGNAL(discStopped()), this, TQT_SLOT(discStopped()));
+  connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), this, TQT_SLOT(discChanged(unsigned)));
   connect( &queryledtimer, TQT_SIGNAL(timeout()),  TQT_SLOT(togglequeryled()) );
   connect( &titlelabeltimer, TQT_SIGNAL(timeout()),  TQT_SLOT(titlelabeltimeout()) );
   connect( &cycletimer, TQT_SIGNAL(timeout()),  TQT_SLOT(cycletimeout()) );
@@ -160,8 +160,8 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int)));
   connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected()));
   connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected()));
-  connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_TQOBJECT(this), TQT_SLOT(setColors()));
-  connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setIcons()));
+  connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(setColors()));
+  connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(setIcons()));
   TQToolTip::remove(songListCB);
   TQToolTip::add(songListCB, i18n("Track list"));
 
@@ -170,24 +170,24 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   m_actions = new TDEActionCollection(this);
 
   TDEAction* action;
-  action = new TDEAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
-  action = new TDEAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
-  action = new TDEAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
-  action = new TDEAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
-  action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions);
-  action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
-  action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
-  action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions);
-  action = new TDEAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
-  action = new TDEAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
-  action = new TDEAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
+  action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQT_SLOT(playClicked()), m_actions, "Play/Pause");
+  action = new TDEAction(i18n("Stop"), Key_S, this, TQT_SLOT(stopClicked()), m_actions, "Stop");
+  action = new TDEAction(i18n("Previous"), Key_B, this, TQT_SLOT(prevClicked()), m_actions, "Previous");
+  action = new TDEAction(i18n("Next"), Key_N, this, TQT_SLOT(nextClicked()), m_actions, "Next");
+  action = KStdAction::quit(this, TQT_SLOT(quitClicked()), m_actions);
+  action = KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
+  action = KStdAction::keyBindings(this, TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
+  action = KStdAction::preferences(this, TQT_SLOT(showConfig()), m_actions);
+  action = new TDEAction(i18n("Loop"), Key_L, this, TQT_SLOT(loopClicked()), m_actions, "Loop");
+  action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQT_SLOT(ejectClicked()), m_actions, "Eject");
+  action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQT_SLOT(incVolume()), m_actions, "IncVolume");
   TDEShortcut increaseVolume = action->shortcut();
   increaseVolume.append( KKey( Key_Equal ) );
   action->setShortcut( increaseVolume );
-  action = new TDEAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
-  action = new TDEAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
-  action = new TDEAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
-  action = new TDEAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+  action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQT_SLOT(decVolume()), m_actions, "DecVolume");
+  action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQT_SLOT(showConfig()), m_actions, "Options");
+  action = new TDEAction(i18n("Shuffle"), Key_R, this, TQT_SLOT(randomSelected()), m_actions, "Shuffle");
+  action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
   
   m_actions->readShortcutSettings("Shortcuts");
   
@@ -227,25 +227,25 @@ KSCD::~KSCD()
 
 void KSCD::initGlobalShortcuts() {
 
-  m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+  m_globalAccel = new TDEGlobalAccel( this );
   
   //Definition of global shortcuts is based on 'local' shortcuts which follow
   //the WIN key.
   m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"),
-                        TQT_TQOBJECT(this), TQT_SLOT(nextClicked()));
+                        this, TQT_SLOT(nextClicked()));
   //NOTE: WIN+B collidates with amarok's default global shortcut.
   m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"),
-                        TQT_TQOBJECT(this), TQT_SLOT(prevClicked()));
+                        this, TQT_SLOT(prevClicked()));
   m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0,
-                        TQT_TQOBJECT(this), TQT_SLOT(playClicked()));
+                        this, TQT_SLOT(playClicked()));
   m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0,
-                        TQT_TQOBJECT(this), TQT_SLOT(stopClicked()));
+                        this, TQT_SLOT(stopClicked()));
   m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"),
-                        TQT_TQOBJECT(this), TQT_SLOT(incVolume()));
+                        this, TQT_SLOT(incVolume()));
   m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"),
-                        TQT_TQOBJECT(this), TQT_SLOT(decVolume()));
+                        this, TQT_SLOT(decVolume()));
   m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0,
-                        TQT_TQOBJECT(this), TQT_SLOT(incVolume()));
+                        this, TQT_SLOT(incVolume()));
   
   m_globalAccel->setConfigGroup( "GlobalShortcuts" );
   m_globalAccel->readSettings( kapp->config() );
@@ -312,7 +312,7 @@ void KSCD::drawPanel()
      trackTimeLED[u]->setLEDoffColor(Prefs::backColor());
      trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor());
      trackTimeLED[u]->setGeometry(2 + u * 18, D, 23,  30);
-     connect(trackTimeLED[u], TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(cycleplaytimemode()));
+     connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode()));
   }
 
   setLEDs(-1);
@@ -765,7 +765,7 @@ void KSCD::showConfig()
 
     updateConfigDialog(confWidget);
 
-    connect(configDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(configDone()));
+    connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone()));
     configDialog -> show();
 } // showConfig()
 
@@ -814,7 +814,7 @@ void KSCD::setDocking(bool dock)
         if (!m_dockWidget)
         {
             m_dockWidget = new DockWidget(this, "dockw");
-            connect(m_dockWidget, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitClicked()));
+            connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked()));
         }
 
         m_dockWidget->show();