Rename KApplication to TDEApplication to avoid conflicts with KDE4

6 files changed, 7 insertions, 7 deletions

diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 013e3b65..672abd25 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -55,7 +55,7 @@ int main( int argc, char *argv[] )
   KommanderWidget::inEditor = true;
 
   KLocale::setMainCatalogue("kommander");
-  KApplication a(true, true);
+  TDEApplication a(true, true);
   
   KConfig *config = kapp->config();
   config->setGroup("General");
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index a389ac57..89c4c5c0 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
   }
   else
     KLocale::setMainCatalogue("kommander");
-  KApplication app;
+  TDEApplication app;
 
   TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
   if (!args->count())
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index d58c1af1..6030a833 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-  KApplication app;
+  TDEApplication app;
   
   if (!args->getOption("add").isNull() || !args->getOption("remove").isNull() || args->isSet("check")  || args->isSet("list"))
   {
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 293d4ed9..0b64b8ba 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -363,7 +363,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
   }
   function.append(TQString("(%1)").arg(items.join(",")));
   TQCString replyType, byteReply;
-  DCOPClient* cl = KApplication::dcopClient();
+  DCOPClient* cl = TDEApplication::dcopClient();
   if (!cl || !cl->call(appId, object, function.latin1(),
        byteData, replyType, byteReply))
   {
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 182f7faf..12542861 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -304,7 +304,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
       byteDataStream << a_query[i+3];
   }
 
-  DCOPClient *cl = KApplication::dcopClient();
+  DCOPClient *cl = TDEApplication::dcopClient();
   if (!cl || !cl->call(appId, object, function.latin1(), byteData, replyType, byteReply))
   {
     printError(i18n("Tried to perform DCOP query, but failed."));
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index 63bb503b..4e88eb22 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -117,14 +117,14 @@ void ExecButton::startProcess()
   if (m_blockGUI != None)
     setEnabled(false);
   if (m_blockGUI == GUI)
-    KApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
+    TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
   MyProcess* process = new MyProcess(this);
   process->setBlocking(m_blockGUI == GUI);
   connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*)));
   m_output = process->run(at);
   if (m_blockGUI == GUI)
   {
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
     if (writeStdout())
       cout << m_output << flush;
   }