Use tdeApp

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

2 files changed, 35 insertions, 35 deletions

diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 3a45e71a..cce4652f 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -59,7 +59,7 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
     popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQ_SLOT(prevClicked()));
     popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQ_SLOT(ejectClicked()));
 
-    TQToolTip::add(this, kapp->aboutData()->programName());
+    TQToolTip::add(this, tdeApp->aboutData()->programName());
 }
 
 DockWidget::~DockWidget()
@@ -110,7 +110,7 @@ void DockWidget::setToolTip(const TQString& text)
 
     if (text.isEmpty())
     {
-        TQToolTip::add(this, kapp->aboutData()->programName());
+        TQToolTip::add(this, tdeApp->aboutData()->programName());
     }
     else
     {
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 68f02405..510a0029 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -160,8 +160,8 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   connect( songListCB, TQ_SIGNAL(activated(int)), TQ_SLOT(trackSelected(int)));
   connect( shufflePB, TQ_SIGNAL(clicked()), TQ_SLOT(randomSelected()));
   connect( cddbPB, TQ_SIGNAL(clicked()), TQ_SLOT(CDDialogSelected()));
-  connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors()));
-  connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons()));
+  connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors()));
+  connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons()));
   TQToolTip::remove(songListCB);
   TQToolTip::add(songListCB, i18n("Track list"));
 
@@ -193,7 +193,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   
   m_actions->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) );
 
-  kapp->installKDEPropertyMap();
+  tdeApp->installKDEPropertyMap();
   TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap();
   map->insert("KComboBox", "currentText");
   
@@ -248,7 +248,7 @@ void KSCD::initGlobalShortcuts() {
                         this, TQ_SLOT(incVolume()));
   
   m_globalAccel->setConfigGroup( "GlobalShortcuts" );
-  m_globalAccel->readSettings( kapp->config() );
+  m_globalAccel->readSettings( tdeApp->config() );
   m_globalAccel->updateConnections();
 }
 
@@ -382,13 +382,13 @@ void KSCD::playClicked()
     if (m_cd->discId() == TDECompactDisc::missingDisc)
         return;
 
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 
     if (!m_cd->isPlaying())
     {
-        kapp->processEvents();
-        kapp->flushX();
+        tdeApp->processEvents();
+        tdeApp->flushX();
 
         if (m_cd->isPaused())
         {
@@ -427,8 +427,8 @@ void KSCD::playClicked()
         playPB->setText(i18n("Play"));
     }
 
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 } // playClicked()
 
 void KSCD::setShuffle(int shuffle)
@@ -462,8 +462,8 @@ void KSCD::stopClicked()
 {
     stoppedByUser = true;
 
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
     m_cd->stop();
 } // stopClicked()
 
@@ -488,8 +488,8 @@ void KSCD::prevClicked()
         }
     }
 
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
     m_cd->play(track, 0, playlist.isEmpty() ? 0 : track);
 } // prevClicked()
 
@@ -516,8 +516,8 @@ bool KSCD::nextClicked()
         }
     }
 
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
     m_cd->play(track, 0, Prefs::randomPlay() || !playlist.isEmpty() ? track + 1 : 0);
     return true;
 } // nextClicked()
@@ -570,8 +570,8 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength)
 
 void KSCD::jumpToTime(int ms, bool forcePlay)
 {
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 
     int track = m_cd->track();
     if ((m_cd->isPlaying() || forcePlay) &&
@@ -617,15 +617,15 @@ void KSCD::quitClicked()
     setLEDs(-1);
 
     // Good GOD this is evil
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 
     if(Prefs::stopExit())
         m_cd->stop();
 
     delete m_cd;
 
-    kapp->quit();
+    tdeApp->quit();
 } // quitClicked()
 
 bool KSCD::event( TQEvent *e )
@@ -639,8 +639,8 @@ void KSCD::loopOn()
     Prefs::setLooping(true);
     loopled->on();
     loopled->show();
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 } // loopOn;
 
 void KSCD::loopOff()
@@ -648,8 +648,8 @@ void KSCD::loopOff()
     Prefs::setLooping(false);
     loopled->off();
     loopled->show();
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 } // loopOff;
 
 void KSCD::loopClicked()
@@ -675,7 +675,7 @@ void KSCD::ejectClicked()
 
 void KSCD::closeEvent(TQCloseEvent *e)
 {
-    if (Prefs::docking() && !kapp->sessionSaving())
+    if (Prefs::docking() && !tdeApp->sessionSaving())
     {
         hide();
         e->ignore();
@@ -1274,8 +1274,8 @@ void KSCD::led_on()
     queryledtimer.start(800);
     queryled->off();
     queryled->show();
-    kapp->processEvents();
-    kapp->flushX();
+    tdeApp->processEvents();
+    tdeApp->flushX();
 } // led_on
 
 void KSCD::togglequeryled()
@@ -1491,7 +1491,7 @@ void KSCD::information(int i)
 bool KSCD::saveState(TQSessionManager& /*sm*/)
 {
   writeSettings();
-  TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
+  TDEConfig* config = tdeApp->sessionConfig();
   config->setGroup("General");
   config->writeEntry("Show", isVisible());
   return true;
@@ -1508,7 +1508,7 @@ void KSCD::keyPressEvent(TQKeyEvent* e)
 
     if (e->key() == TQt::Key_F1)
     {
-        kapp->invokeHelp();
+        tdeApp->invokeHelp();
     }
     else if (isNum)
     {
@@ -1648,7 +1648,7 @@ int main( int argc, char *argv[] )
 
     TDEUniqueApplication a;
 
-    kapp->dcopClient()->setDefaultObject("CDPlayer");
+    tdeApp->dcopClient()->setDefaultObject("CDPlayer");
 
     KSCD *k = new KSCD();
 
@@ -1657,9 +1657,9 @@ int main( int argc, char *argv[] )
 
     k->setCaption(a.caption());
 
-    if (kapp->isRestored())
+    if (tdeApp->isRestored())
     {
-        TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
+        TDEConfig* config = tdeApp->sessionConfig();
         config->setGroup("General");
         if (config->readBoolEntry("Show"))
             k->show();