1 files changed, 17 insertions, 17 deletions

diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 98a5d45b..7fe8633e 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -28,7 +28,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 /*
  Test plan for the various cases of interaction between standalone apps and kontact:
@@ -78,10 +78,10 @@ using namespace Kontact;
 
 int UniqueAppHandler::newInstance()
 {
-  // This bit is duplicated from KUniqueApplication::newInstance()
-  if ( kapp->mainWidget() ) {
-    kapp->mainWidget()->show();
-    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+  // This bit is duplicated from TDEUniqueApplication::newInstance()
+  if ( tdeApp->mainWidget() ) {
+    tdeApp->mainWidget()->show();
+    KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
     TDEStartupInfo::appStarted();
   }
 
@@ -99,13 +99,13 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
     TDECmdLineArgs::reset(); // forget options defined by other "applications"
     loadCommandLineOptions(); // implemented by plugin
 
-    // This bit is duplicated from KUniqueApplication::processDelayed()
+    // This bit is duplicated from TDEUniqueApplication::processDelayed()
     TQDataStream ds( data, IO_ReadOnly );
     TDECmdLineArgs::loadAppArgs( ds );
     if ( !ds.atEnd() ) { // backwards compatibility
       TQCString asn_id;
       ds >> asn_id;
-      kapp->setStartupId( asn_id );
+      tdeApp->setStartupId( asn_id );
     }
 
     TQDataStream _replyStream( replyData, IO_WriteOnly );
@@ -148,16 +148,16 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
     : TQObject( plugin ), mFactory( factory ), mPlugin( plugin )
 {
   // The app is running standalone if 1) that name is known to DCOP
-  mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() );
+  mRunningStandalone = tdeApp->dcopClient()->isApplicationRegistered( plugin->name() );
 
   // and 2) it's not registered by kontact (e.g. in another plugin)
-  if ( mRunningStandalone && kapp->dcopClient()->findLocalClient( plugin->name() ) )
+  if ( mRunningStandalone && tdeApp->dcopClient()->findLocalClient( plugin->name() ) )
       mRunningStandalone = false;
 
   if ( mRunningStandalone ) {
-    kapp->dcopClient()->setNotifications( true );
-    connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-             this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+    tdeApp->dcopClient()->setNotifications( true );
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+             this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
   } else {
     mFactory->createHandler( mPlugin );
   }
@@ -166,7 +166,7 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
 UniqueAppWatcher::~UniqueAppWatcher()
 {
   if ( mRunningStandalone )
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
 
   delete mFactory;
 }
@@ -174,11 +174,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
 void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( appId == mPlugin->name() && mRunningStandalone ) {
-    disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-                this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+    disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+                this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
     kdDebug(5601) << k_funcinfo << appId << endl;
     mFactory->createHandler( mPlugin );
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
     mRunningStandalone = false;
   }
 }
@@ -196,7 +196,7 @@ static TDECmdLineOptions options[] =
 void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
 {
   TDECmdLineArgs::addCmdLineOptions( options );
-  KUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication::addCmdLineOptions();
   TDEApplication::addCmdLineOptions();
 }