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

---
 adept/batch/app.cpp      | 2 +-
 adept/batch/app.h        | 2 +-
 adept/batch/main.cpp     | 6 +++---
 adept/installer/main.cpp | 6 +++---
 adept/manager/main.cpp   | 6 +++---
 adept/notifier/app.cpp   | 2 +-
 adept/updater/main.cpp   | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp
index efe0e54..087f818 100644
--- a/adept/batch/app.cpp
+++ b/adept/batch/app.cpp
@@ -36,7 +36,7 @@ using namespace aptFront;
 using namespace aptFront::cache;
 using namespace adept;
 
-App::App( KCmdLineArgs *args ) {
+App::App( TDECmdLineArgs *args ) {
     setMainWidget( this );
     initialize();
     TQString qs_pkgname;
diff --git a/adept/batch/app.h b/adept/batch/app.h
index 7556483..ede6e36 100644
--- a/adept/batch/app.h
+++ b/adept/batch/app.h
@@ -33,7 +33,7 @@ class App : public KMainWindow, Application {
 public:
     void setupActions();
     ExtTerminalInterface *terminal();
-	App( KCmdLineArgs *a );
+	App( TDECmdLineArgs *a );
 signals:
   void imDone();
 protected slots:
diff --git a/adept/batch/main.cpp b/adept/batch/main.cpp
index 49e7c07..b0713d8 100644
--- a/adept/batch/main.cpp
+++ b/adept/batch/main.cpp
@@ -32,11 +32,11 @@ int main(int argc, char *argv[])
                           "me at mornfall dot net",
                           "http://web.mornfall.net");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options ); 
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options ); 
 
     KApplication app;
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
 
     App *ta = new App( args );
diff --git a/adept/installer/main.cpp b/adept/installer/main.cpp
index b07406c..fb10492 100644
--- a/adept/installer/main.cpp
+++ b/adept/installer/main.cpp
@@ -33,12 +33,12 @@ int main(int argc, char *argv[])
                           "me at mornfall dot net",
                           "http://web.mornfall.net");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
     KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
 
diff --git a/adept/manager/main.cpp b/adept/manager/main.cpp
index a0dd563..2f0b88c 100644
--- a/adept/manager/main.cpp
+++ b/adept/manager/main.cpp
@@ -33,12 +33,12 @@ int main(int argc, char *argv[])
                           "me at mornfall dot net",
                           "http://web.mornfall.net");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     // if (args && args->isSet("xy")) ...
 
     /* KConfig* config = KGlobal::config();
diff --git a/adept/notifier/app.cpp b/adept/notifier/app.cpp
index 5e179ac..e79567f 100644
--- a/adept/notifier/app.cpp
+++ b/adept/notifier/app.cpp
@@ -354,7 +354,7 @@ int main(int argc, char *argv[])
                      "2.1 Cruiser",
                      DESCRIPTION, KAboutData::License_BSD,
                      "Copyright (C) 2005, 2006 Peter Rockai");
-    KCmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::init(argc, argv, &about);
     NotifierApp::addCmdLineOptions();
 
     if (!NotifierApp::start())
diff --git a/adept/updater/main.cpp b/adept/updater/main.cpp
index cf003ed..39c414d 100644
--- a/adept/updater/main.cpp
+++ b/adept/updater/main.cpp
@@ -33,12 +33,12 @@ int main(int argc, char *argv[])
                           "me at mornfall dot net",
                           "http://web.mornfall.net");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     // if (args && args->isSet("xy")) ...
 
     /* KConfig* config = KGlobal::config();
-- 
cgit v1.2.1