Use tdeApprename/tdeapp

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

6 files changed, 15 insertions, 15 deletions

diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 24f6efe0c..d19a25765 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -176,7 +176,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, labelTxt );
     uiserver.transferring( progressId, labelTxt );
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index ac4904a83..24d9c25e0 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -55,14 +55,14 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource,
   mDCOPClient->attach();
   mDCOPClient->registerAs( objId, true );
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
            this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
 }
 
 KMailConnection::~KMailConnection()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete mKMailIcalIfaceStub;
   mKMailIcalIfaceStub = 0;
   delete mDCOPClient;
@@ -78,13 +78,13 @@ bool KMailConnection::connectToKMail()
     // if we are kmail (and probably kontact as well) ourselves, don't try to start us again
     // this prevents a DCOP deadlock when launching the kmail while kontact is the IMAP backend
     // provider (and probably vice versa)
-    if ( kapp->instanceName() == "kmail" ) {
+    if ( tdeApp->instanceName() == "kmail" ) {
       // someone, probably ourselves, already offers the interface, if not stop here
-      const QCStringList services = kapp->dcopClient()->registeredApplications();
+      const QCStringList services = tdeApp->dcopClient()->registeredApplications();
       for ( uint i = 0; i < services.count(); ++i ) {
         if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
-        const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
+        const QCStringList objs = tdeApp->dcopClient()->remoteObjects( services[i] );
         if ( objs.contains( dcopObjectId ) ) {
           dcopService = services[i];
           break;
@@ -107,7 +107,7 @@ bool KMailConnection::connectToKMail()
       }
     }
 
-    mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(),
+    mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(),
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index 7476212e6..4415ce2ef 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
@@ -201,7 +201,7 @@ bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource )
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) );
     uiserver.transferring( progressId, "Contacts" );
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index 6b796e5d4..cd341e2d3 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -165,7 +165,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, labelTxt );
     uiserver.transferring( progressId, labelTxt );
diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 6f239cc2f..dec929ce7 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -54,14 +54,14 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
   mDCOPClient->attach();
   mDCOPClient->registerAs( objId, true );
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
            this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
 }
 
 KMailConnection::~KMailConnection()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete mKMailIcalIfaceStub;
   mKMailIcalIfaceStub = 0;
   delete mDCOPClient;
@@ -84,7 +84,7 @@ bool KMailConnection::connectToKMail()
       return false;
     }
 
-    mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(),
+    mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(),
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp
index dc953ded0..91fe99dd9 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix.cpp
@@ -197,7 +197,7 @@ bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) );
     uiserver.transferring( progressId, "Contacts" );