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

---
 kmymoney2/kmymoney2.cpp       | 2 +-
 kmymoney2/kmymoneytest.cpp    | 6 +++---
 kmymoney2/main.cpp            | 2 +-
 kmymoney2/views/khomeview.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmymoney2')

diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 23927ca..baf0db5 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -4263,7 +4263,7 @@ void KMyMoney2App::slotKDELanguageSettings(void)
   TQString error;
   int pid;
 
-  KApplication::tdeinitExec("kcmshell", args, &error, &pid);
+  TDEApplication::tdeinitExec("kcmshell", args, &error, &pid);
 }
 
 void KMyMoney2App::slotNewFeature(void)
diff --git a/kmymoney2/kmymoneytest.cpp b/kmymoney2/kmymoneytest.cpp
index 84a7f32..46d54b7 100644
--- a/kmymoney2/kmymoneytest.cpp
+++ b/kmymoney2/kmymoneytest.cpp
@@ -118,11 +118,11 @@ int main(int testargc, char** testargv)
      KCmdLineLastOption // End of options.
   };
 
-  // we seem to need a KApplication object to use KGlobal::locale()
+  // we seem to need a TDEApplication object to use KGlobal::locale()
   TDECmdLineArgs::init(testargc, testargv, testargv[0], "UNIT TESTS", "", "0.1");
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication::disableAutoDcopRegistration();
-  KApplication app(false, false);
+  TDEApplication::disableAutoDcopRegistration();
+  TDEApplication app(false, false);
 
 #ifdef _CHECK_MEMORY
   _CheckMemory_Init(0);
diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp
index 26a89a2..d171acf 100644
--- a/kmymoney2/main.cpp
+++ b/kmymoney2/main.cpp
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
 
   KMyMoneyUtils::checkConstants();
 
-  KApplication* a = new KApplication();
+  TDEApplication* a = new TDEApplication();
 
   if(KGlobal::locale()->monetaryDecimalSymbol().isEmpty()) {
     KMessageBox::error(0, i18n("The monetary decimal symbol is not correctly set in the TDE Control Center's Country/Region & Language settings. Please set it to a reasonable value and start KMyMoney again."), i18n("Invalid settings"));
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index 2469ed3..47bba63 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -1116,11 +1116,11 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */)
 
   if ( protocol == "http" )
   {
-    KApplication::kApplication()->invokeBrowser(url.prettyURL());
+    TDEApplication::kApplication()->invokeBrowser(url.prettyURL());
   }
   else if ( protocol == "mailto" )
   {
-    KApplication::kApplication()->invokeMailer(url);
+    TDEApplication::kApplication()->invokeMailer(url);
   }
   else
   {
-- 
cgit v1.2.1