Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 8 insertions, 8 deletions

diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index e521023e..d7234332 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -320,7 +320,7 @@ void WdgScriptsManager::slotUnloadScript()
 void WdgScriptsManager::slotGetNewScript()
 {
 #ifdef KROSS_SUPPORT_NEWSTUFF
-    const TQString appname = KApplication::kApplication()->name();
+    const TQString appname = TDEApplication::kApplication()->name();
     const TQString type = TQString("%1/script").arg(appname);
 
     if(! d->newstuff) {
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index fcff2bb0..74c84cf3 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -45,7 +45,7 @@
 #define ERROR_UNHALDEDEXCEPTION -5
 #define ERROR_EXCEPTION -6
 
-KApplication* app = 0;
+TDEApplication* app = 0;
 
 int runScriptFile(const TQString& scriptfile)
 {
@@ -125,8 +125,8 @@ int main(int argc, char **argv)
         return ERROR_HELP;
     }
 
-    // Create KApplication instance.
-    app = new KApplication( /* allowStyles */ true, /* GUIenabled */ true );
+    // Create TDEApplication instance.
+    app = new TDEApplication( /* allowStyles */ true, /* GUIenabled */ true );
 
     //TQString interpretername = args->getOption("interpreter");
     //TQString scriptfilename = args->getOption("scriptfile");
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
             break;
     }
 
-    // Free the KApplication instance and exit the program.
+    // Free the TDEApplication instance and exit the program.
     delete app;
     return result;
 }
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index f8caf2d8..a42f9f46 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -49,7 +49,7 @@
 #include <string>
 #include <iostream>
 
-KApplication *app = 0;
+TDEApplication *app = 0;
 
 
 
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
         f.close();
 
         if( args->isSet("gui") ) {
-            app = new KApplication();
+            app = new TDEApplication();
             TestWindow *mainWin = new TestWindow(interpretername, scriptcode);
             app->setMainWidget(mainWin);
             mainWin->show();
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
             result = app->exec();
         }
         else {
-            app = new KApplication(true, true);
+            app = new TDEApplication(true, true);
             runInterpreter(interpretername, scriptcode);
         }
     }