Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 4 insertions, 4 deletions

diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index 44291450..eae6d49a 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -208,7 +208,7 @@ namespace Komposer
     void slotShutdownTimeout();
 
     /**
-     * Common entry point to deref() the KApplication. Used both by the clean
+     * Common entry point to deref() the TDEApplication. Used both by the clean
      * shutdown and the timeout condition of slotShutdownTimeout()
      */
     void slotShutdownDone();
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 2d394a22..80bf8fc9 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -42,7 +42,7 @@ int main( int argc, char** argv )
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     Q_UNUSED( args );
diff --git a/libtdepim/komposer/core/tests/testkomposer.cpp b/libtdepim/komposer/core/tests/testkomposer.cpp
index 31462a7e..efacb460 100644
--- a/libtdepim/komposer/core/tests/testkomposer.cpp
+++ b/libtdepim/komposer/core/tests/testkomposer.cpp
@@ -8,7 +8,7 @@
 int main( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
-  KApplication app;
+  TDEApplication app;
 
   Komposer::Core *core = new Komposer::Core();
   app.setMainWidget( core );
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index a9b06171..b883997f 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -45,7 +45,7 @@ void TestManager::slotPluginLoaded( Plugin *plugin )
 int main( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
-  KApplication app;
+  TDEApplication app;
 
   TestManager manager( &app );