Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/kded/kded.cpp b/kded/kded.cpp
index 6572ff58b..4d3cecbfa 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -75,7 +75,7 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
       dataStream << TQString("tdebuildsycoca") << args;
       TQCString _launcher = TDEApplication::launcher();
 
-      kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
+      tdeApp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
@@ -148,14 +148,14 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
   if (!module)
      return false;
 
-  module->setCallingDcopClient(kapp->dcopClient());
+  module->setCallingDcopClient(tdeApp->dcopClient());
   return module->process(fun, data, replyType, replyData);
 }
 
 void Kded::initModules()
 {
      m_dontLoad.clear();
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      bool tde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
     // not the same user like the one running the session (most likely we're run via sudo or something)
     if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@@ -227,7 +227,7 @@ void Kded::initModules()
 void Kded::loadSecondPhase()
 {
      kdDebug(7020) << "Loading second phase autoload" << endl;
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      KService::List kdedModules = KServiceType::offers("KDEDModule");
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
@@ -510,7 +510,7 @@ void Kded::recreateDone()
       TQByteArray replyData;
       DCOPClientTransaction *transaction = m_recreateRequests.first();
       if (transaction)
-         kapp->dcopClient()->endTransaction(transaction, replyType, replyData);
+         tdeApp->dcopClient()->endTransaction(transaction, replyType, replyData);
       m_recreateRequests.remove(m_recreateRequests.begin());
    }
    m_recreateBusy = false;
@@ -553,7 +553,7 @@ bool Kded::process(const TQCString &fun, const TQByteArray &data,
        }
        m_recreateCount++;
     }
-    m_recreateRequests.append(kapp->dcopClient()->beginTransaction());
+    m_recreateRequests.append(tdeApp->dcopClient()->beginTransaction());
     replyType = "void";
     return true;
   } else {
@@ -659,8 +659,8 @@ void Kded::unregisterWindowId(long windowId)
 
 static void sighandler(int /*sig*/)
 {
-    if (kapp)
-       kapp->quit();
+    if (tdeApp)
+       tdeApp->quit();
 }
 
 KUpdateD::KUpdateD()
@@ -751,9 +751,9 @@ public:
   virtual bool process(const TQCString &fun, const TQByteArray &data,
                        TQCString& replyType, TQByteArray &replyData)
     {
-      if ( kapp && (fun == "quit()") )
+      if ( tdeApp && (fun == "quit()") )
       {
-        kapp->quit();
+        tdeApp->quit();
         replyType = "void";
         return true;
       }
@@ -954,7 +954,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
      if (bCheckHostname)
         (void) new KHostnameD(HostnamePollInterval); // Watch for hostname changes
 
-     DCOPClient *client = kapp->dcopClient();
+     DCOPClient *client = tdeApp->dcopClient();
      TQObject::connect(client, TQ_SIGNAL(applicationRemoved(const TQCString&)),
              kded, TQ_SLOT(slotApplicationRemoved(const TQCString&)));
      client->setNotifications(true);