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

---
 quanta/src/kqapp.cpp       | 2 +-
 quanta/src/kqapp.h         | 2 +-
 quanta/src/main.cpp        | 4 ++--
 quanta/src/quanta.cpp      | 2 +-
 quanta/src/quanta_init.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'quanta/src')

diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index a470dd13..39053e86 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -60,7 +60,7 @@ KSplash::~KSplash()
 
 
 KQApplication::KQApplication()
- : KApplication()
+ : TDEApplication()
 {
    args = TDECmdLineArgs::parsedArgs();
    splash = 0L;
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index ab154345..c99c152b 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -49,7 +49,7 @@ class KQApplicationPrivate
     KSplashScreen *sp;
 };
 
-class KQApplication : public KApplication, KQApplicationPrivate
+class KQApplication : public TDEApplication, KQApplicationPrivate
 {
   Q_OBJECT
   
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 3b725f9d..52d4b07c 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -192,8 +192,8 @@ int main(int argc, char *argv[])
     }
   }
 
-  KApplication *app;
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication *app;
+  TDEApplication::disableAutoDcopRegistration();
 
   if (isUnique) {
       KUniqueApplication::dcopClient()->registerAs("quanta-foo");
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 5525a570..81c04aff 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1150,7 +1150,7 @@ void QuantaApp::slotOptionsConfigureActions()
 void QuantaApp::slotPreviewOptions()
 {
   KMessageBox::information(this, i18n("Changes made in the preview configuration dialog are global and have effect on every application using the KHTML part to display web pages, including Konqueror."), i18n("Warning"), "configure_preview_warning");
-  KApplication::startServiceByDesktopName("quanta_preview_config");
+  TDEApplication::startServiceByDesktopName("quanta_preview_config");
 }
 
 void QuantaApp::slotOptions()
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index e59ba248..42765a21 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -1484,7 +1484,7 @@ void QuantaInit::checkRuntimeDependencies()
   TQString error;
   TQCString appId;
 
-  KApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error,
+  TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(), &error,
                                             &appId);
   if (appId.isEmpty())
   {
-- 
cgit v1.2.1