1 files changed, 13 insertions, 13 deletions
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index f7483da..77ce33e 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -50,7 +50,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdestartupinfo.h>
 #include <tdemessagebox.h>
 
@@ -64,7 +64,7 @@ K3bApplication::Core* K3bApplication::Core::s_k3bAppCore = 0;
 
 
 K3bApplication::K3bApplication()
-  : KUniqueApplication(),
+  : TDEUniqueApplication(),
     m_mainWindow(0),
     m_needToInit(true)
 {
@@ -72,16 +72,16 @@ K3bApplication::K3bApplication()
   TDEGlobal::locale()->insertCatalogue( "libk3bdevice" );
   TDEGlobal::locale()->insertCatalogue( "libk3b" );
 
-  m_core = new Core( TQT_TQOBJECT(this) );
+  m_core = new Core( this );
 
   // TODO: move to K3bCore?
   // from this point on available through K3bAudioServer::instance()
-  m_audioServer = new K3bAudioServer( TQT_TQOBJECT(this), "K3bAudioServer" );
+  m_audioServer = new K3bAudioServer( this, "K3bAudioServer" );
 
-  connect( m_core, TQT_SIGNAL(initializationInfo(const TQString&)),
-	   TQT_SIGNAL(initializationInfo(const TQString&)) );
+  connect( m_core, TQ_SIGNAL(initializationInfo(const TQString&)),
+	   TQ_SIGNAL(initializationInfo(const TQString&)) );
 
-  connect( this, TQT_SIGNAL(shutDown()), TQT_SLOT(slotShutDown()) );
+  connect( this, TQ_SIGNAL(shutDown()), TQ_SLOT(slotShutDown()) );
 }
 
 
@@ -104,10 +104,10 @@ void K3bApplication::init()
       m_core->m_themeManager->readConfig( config() );
 
       splash = new K3bSplash( 0 );
-      splash->connect( this, TQT_SIGNAL(initializationInfo(const TQString&)), TQT_SLOT(addInfo(const TQString&)) );
+      splash->connect( this, TQ_SIGNAL(initializationInfo(const TQString&)), TQ_SLOT(addInfo(const TQString&)) );
 
       // kill the splash after 5 seconds
-      TQTimer::singleShot( 5000, splash, TQT_SLOT(close()) );
+      TQTimer::singleShot( 5000, splash, TQ_SLOT(close()) );
 
       splash->show();
       tqApp->processEvents();
@@ -169,7 +169,7 @@ int K3bApplication::newInstance()
   else
     processCmdLineArgs();
 
-  return KUniqueApplication::newInstance();
+  return TDEUniqueApplication::newInstance();
 }
 
 
@@ -362,7 +362,7 @@ K3bDevice::DeviceManager* K3bApplication::Core::deviceManager() const
 
 TDEConfig* K3bApplication::Core::config() const
 {
-  return kapp->config();
+  return tdeApp->config();
 }
 
 
@@ -382,8 +382,8 @@ void K3bApplication::Core::init()
 
   mediaCache()->buildDeviceList( deviceManager() );
 
-  connect( deviceManager(), TQT_SIGNAL(changed(K3bDevice::DeviceManager*)),
-           mediaCache(), TQT_SLOT(buildDeviceList(K3bDevice::DeviceManager*)) );
+  connect( deviceManager(), TQ_SIGNAL(changed(K3bDevice::DeviceManager*)),
+           mediaCache(), TQ_SLOT(buildDeviceList(K3bDevice::DeviceManager*)) );
 }