Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 4 insertions, 4 deletions

diff --git a/kate/ChangeLog b/kate/ChangeLog
index e6aedc9b6..e97ab3515 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -208,7 +208,7 @@
   * QPopupMenu for filelist
 
 2001-03-20 Christoph Cullmann <[email protected]>
-  * kate is now a normal KApplication
+  * kate is now a normal TDEApplication
 
 2001-03-18 Christoph Cullmann <[email protected]>
   * big location changes of source files
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 2553000a1..dd9d0ba84 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -52,7 +52,7 @@
 #include <sys/types.h>
 
 KateApp::KateApp (TDECmdLineArgs *args)
- : KApplication ()
+ : TDEApplication ()
  , m_args (args)
  , m_shouldExit (false)
 {
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index ffbd56e3e..fb7d30f5b 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -39,7 +39,7 @@ class TDECmdLineArgs;
  * Kate Application
  * This class represents the core kate application object
  */
-class KDE_EXPORT KateApp : public KApplication
+class KDE_EXPORT KateApp : public TDEApplication
 {
   Q_OBJECT
 
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index dd2768b1a..02b00017f 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -591,7 +591,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication a;
+  TDEApplication a;
 
   KGlobal::locale()->insertCatalogue("katepart");