From 95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:24:38 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 parts/documentation/documentation_part.cpp     | 14 +++++++-------
 parts/documentation/tools/htdig/htdigindex.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'parts/documentation')

diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 82df1ad4..37bd7a40 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -623,7 +623,7 @@ TQCString DocumentationPart::startAssistant()
 {
     static TQCString lastAssistant = "";
     
-    if (!lastAssistant.isEmpty() && KApplication::dcopClient()->isApplicationRegistered(lastAssistant))
+    if (!lastAssistant.isEmpty() && TDEApplication::dcopClient()->isApplicationRegistered(lastAssistant))
         return lastAssistant;
     
     const char *function = 0;
@@ -636,7 +636,7 @@ TQCString DocumentationPart::startAssistant()
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if (!KApplication::dcopClient()->call("klauncher", "klauncher", function,  data, replyType, replyData))
+    if (!TDEApplication::dcopClient()->call("klauncher", "klauncher", function,  data, replyType, replyData))
     {
         kdDebug() << "call failed" << endl;
         lastAssistant = "";
@@ -665,7 +665,7 @@ TQCString DocumentationPart::startAssistant()
             kdDebug() << dcopName.data() << endl;
             
             //@fixme: is there another way to wait for the remote object to be loaded
-            while (!KApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation"))
+            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation"))
                 usleep(500);
         }
     }
@@ -697,7 +697,7 @@ void DocumentationPart::activateAssistantWindow(const TQCString &ref)
     kdDebug() << "DocumentationPart::activateAssistantWindow" << endl;
     TQByteArray data, replyData;
     TQCString replyType;
-    if (KApplication::dcopClient()->call(ref, "MainWindow", "getWinID()", data, replyType, replyData))
+    if (TDEApplication::dcopClient()->call(ref, "MainWindow", "getWinID()", data, replyType, replyData))
     {
         kdDebug() << "    call successful " << endl;
         TQDataStream reply(replyData, IO_ReadOnly);
@@ -707,7 +707,7 @@ void DocumentationPart::activateAssistantWindow(const TQCString &ref)
         kdDebug() << "Win ID: " << winId << endl;
         KWin::forceActiveWindow(winId);
 
-        KApplication::dcopClient()->send(ref, "MainWindow", "show()", TQByteArray());
+        TDEApplication::dcopClient()->send(ref, "MainWindow", "show()", TQByteArray());
     }
 }
 
@@ -715,7 +715,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin
 {
     TQCString ref = startAssistant();
     TQByteArray data;
-    if (KApplication::dcopClient()->send(ref, interface, method, data))
+    if (TDEApplication::dcopClient()->send(ref, interface, method, data))
         activateAssistantWindow(ref);
     else
         kdDebug() << "problem communicating with: " << ref;
@@ -727,7 +727,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin
     TQByteArray data;
     TQDataStream arg(data, IO_WriteOnly);
     arg << dataStr;
-    if (KApplication::dcopClient()->send(ref, interface, method, data))
+    if (TDEApplication::dcopClient()->send(ref, interface, method, data))
         activateAssistantWindow(ref);
     else
         kdDebug() << "problem communicating with: " << ref;
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 07ded01c..a728da7b 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
     KGlobal::locale()->setMainCatalogue("tdevelop");
 
-- 
cgit v1.2.3