From 6ec5cc8d82b29c330def669cf20534cadd2cf29e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 23:57:47 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 lib/kofficecore/KoApplication.cpp    | 4 ++--
 lib/kofficecore/KoApplication.h      | 2 +-
 lib/kofficecore/KoDocument.h         | 6 +++---
 lib/kofficecore/tests/korecttest.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/kofficecore')

diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 5346ff0ab..47861558c 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -56,7 +56,7 @@ public:
 };
 
 KoApplication::KoApplication()
-        : KApplication( initHack() )
+        : TDEApplication( initHack() )
 {
     d = new KoApplicationPrivate;
 
@@ -70,7 +70,7 @@ KoApplication::KoApplication()
     m_starting = true;
 }
 
-// This gets called before entering KApplication::KApplication
+// This gets called before entering TDEApplication::TDEApplication
 bool KoApplication::initHack()
 {
     TDECmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" );
diff --git a/lib/kofficecore/KoApplication.h b/lib/kofficecore/KoApplication.h
index 1682b2459..87a711f2d 100644
--- a/lib/kofficecore/KoApplication.h
+++ b/lib/kofficecore/KoApplication.h
@@ -39,7 +39,7 @@ class KoApplicationPrivate;
  *  If the last mainwindow becomes closed, KoApplication automatically
  *  calls TQApplication::quit.
  */
-class KOFFICECORE_EXPORT KoApplication : public KApplication
+class KOFFICECORE_EXPORT KoApplication : public TDEApplication
 {
     Q_OBJECT
   
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index f521607bf..63fd47c96 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -181,7 +181,7 @@ public:
     /**
      * @brief Used by KoApplication, and by KoMainWindow, when no document exists yet.
      *
-     * With the help of @p instance or KApplication::instance() this
+     * With the help of @p instance or TDEApplication::instance() this
      * method figures out which .desktop file matches this application. In this
      * file it searches for the "X-TDE-NativeMimeType" entry and returns it.
      *
@@ -193,7 +193,7 @@ public:
     /**
      * Used by KoMainWindow, when no document exists yet.
      *
-     * With the help of @p instance or KApplication::instance() this
+     * With the help of @p instance or TDEApplication::instance() this
      * method figures out which .desktop file matches this application. In this
      * file it searches for the "X-TDE-ExtraNativeMimeTypes" entry and returns it.
      *
@@ -203,7 +203,7 @@ public:
     static TQStringList readExtraNativeMimeTypes( KInstance *instance = 0 );
 
     /**
-     * With the help of @p instance or KApplication::instance() this
+     * With the help of @p instance or TDEApplication::instance() this
      * method figures out which .desktop file matches this application,
      * and returns the KService instance for it.
      */
diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp
index f1a1fd89e..6866e1766 100644
--- a/lib/kofficecore/tests/korecttest.cpp
+++ b/lib/kofficecore/tests/korecttest.cpp
@@ -35,7 +35,7 @@ bool check(TQString txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-  KApplication app(argc,argv,"korecttest",false,false);
+  TDEApplication app(argc,argv,"korecttest",false,false);
 
   KoRect emptyRect;
   check( "KoRect() is null", emptyRect.isNull(), true );
-- 
cgit v1.2.3