From ca1ec6eeaaf5744fae891a5b0696591bbaece795 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 18:46:49 -0600
Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

---
 quanta/src/kqapp.cpp | 4 ++--
 quanta/src/kqapp.h   | 4 ++--
 quanta/src/main.cpp  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'quanta')

diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index b39b0c46..a470dd13 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -62,7 +62,7 @@ KSplash::~KSplash()
 KQApplication::KQApplication()
  : KApplication()
 {
-   args = KCmdLineArgs::parsedArgs();
+   args = TDECmdLineArgs::parsedArgs();
    splash = 0L;
 
    KGlobal::dirs()->addPrefix(PREFIX);
@@ -132,7 +132,7 @@ KQUniqueApplication::~KQUniqueApplication()
 
 int KQUniqueApplication::newInstance()
 {
-  args = KCmdLineArgs::parsedArgs();
+  args = TDECmdLineArgs::parsedArgs();
   if (mainWidget())
   {
     KWin::activateWindow( mainWidget()->winId() );
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index b1b5f6df..ab154345 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -22,7 +22,7 @@
 #include <tqframe.h>
 #include <kuniqueapplication.h>
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class KSplashScreen;
 
 class KSplash : public TQFrame
@@ -45,7 +45,7 @@ class KQApplicationPrivate
     void init();
 
     KSplash *splash;
-    KCmdLineArgs *args;
+    TDECmdLineArgs *args;
     KSplashScreen *sp;
 };
 
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 3e11bacb..3b725f9d 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -177,10 +177,10 @@ int main(int argc, char *argv[])
     I18N_NOOP("Splash screen and icon for 3.2"),
     "luci@sh.ground.cz");
 
-  KCmdLineArgs::init( argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::init( argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-  // this defeats the purpose of KCmdLineArgs, but there is no other
+  // this defeats the purpose of TDECmdLineArgs, but there is no other
   // way around, I'm afraid.
   const char *uniq = "--unique";
   bool isUnique = false;
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
       KUniqueApplication::dcopClient()->registerAs("quanta-foo");
       if (KUniqueApplication::dcopClient()->isApplicationRegistered("quanta"))
       {
-          KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+          TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
            for (int i = 0; i < args->count(); i++)
           {
               TQString s = args->url(i).url();
-- 
cgit v1.2.1