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

---
 kcminit/main.cpp | 8 ++++----
 kcminit/main.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcminit')

diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index b1fa455c9..93eb84a9e 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -126,7 +126,7 @@ void KCMInit::runModules( int phase )
   }
 }
 
-KCMInit::KCMInit( KCmdLineArgs* args )
+KCMInit::KCMInit( TDECmdLineArgs* args )
 : DCOPObject( "kcminit" )
 {
   TQCString arg;
@@ -238,13 +238,13 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 	"",
 	I18N_NOOP("KCMInit - runs startups initialization for Control Modules."));
 
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
   KApplication app;
   app.dcopClient()->registerAs( "kcminit", false );
   KLocale::setMainCatalogue(0);
-  KCMInit kcminit( KCmdLineArgs::parsedArgs());
+  KCMInit kcminit( TDECmdLineArgs::parsedArgs());
   return 0;
 }
 
diff --git a/kcminit/main.h b/kcminit/main.h
index 0efa0c10c..9651a8516 100644
--- a/kcminit/main.h
+++ b/kcminit/main.h
@@ -23,7 +23,7 @@
 #include <dcopobject.h>
 #include <kservice.h>
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 
 class KCMInit : public TQObject, public DCOPObject
 {
@@ -33,7 +33,7 @@ class KCMInit : public TQObject, public DCOPObject
         void runPhase1();
         void runPhase2();
     public:
-        KCMInit( KCmdLineArgs* args );
+        KCMInit( TDECmdLineArgs* args );
         virtual ~KCMInit();
     private:
         bool runModule(const TQString &libName, KService::Ptr service);
-- 
cgit v1.2.3