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

---
 kate/app/kateapp.cpp    | 2 +-
 kate/app/kateapp.h      | 2 +-
 kate/app/kwritemain.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kate/app')

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");
 
-- 
cgit v1.2.1