Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

3 files changed, 11 insertions, 11 deletions

diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp
index 13660c7e..eb581f34 100644
--- a/cervisia/cvsservice/cvsaskpass.cpp
+++ b/cervisia/cvsservice/cvsaskpass.cpp
@@ -42,8 +42,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
                      KAboutData::License_LGPL,
                      I18N_NOOP("Copyright (c) 2003 Christian Loose"));
 
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
     // no need to register with the dcop server
     KApplication::disableAutoDcopRegistration();
@@ -52,11 +52,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
     // no need for session management
     app.disableSessionManagement();
 
-    if( !KCmdLineArgs::parsedArgs()->count() )
+    if( !TDECmdLineArgs::parsedArgs()->count() )
         return 1;
 
     // parse repository name from the passed argument
-    TQString prompt = KCmdLineArgs::parsedArgs()->arg(0);
+    TQString prompt = TDECmdLineArgs::parsedArgs()->arg(0);
     TQRegExp rx("(.*@.*)'s password:");
     int pos = rx.search(prompt);
 
diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp
index d8975783..3264487c 100644
--- a/cervisia/cvsservice/main.cpp
+++ b/cervisia/cvsservice/main.cpp
@@ -33,7 +33,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
     about.addAuthor("Christian Loose", I18N_NOOP("Developer"),
             "christian.loose@hamburg.de");
 
-    KCmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::init(argc, argv, &about);
 
     KApplication app;
     
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 9d6e181d..4a5bb5ad 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -164,22 +164,22 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     about.addCredit("Richard Moore", I18N_NOOP("Conversion to KPart"),
                     "rich@kde.org", 0);
 
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
     KApplication app;
 
-    TQString resolvefile = KCmdLineArgs::parsedArgs()->getOption("resolve");
+    TQString resolvefile = TDECmdLineArgs::parsedArgs()->getOption("resolve");
     if (!resolvefile.isEmpty())
         return ShowResolveDialog(resolvefile);
 
     // is command line option 'show log dialog' specified?
-    TQString logFile = KCmdLineArgs::parsedArgs()->getOption("log");
+    TQString logFile = TDECmdLineArgs::parsedArgs()->getOption("log");
     if( !logFile.isEmpty() )
         return ShowLogDialog(logFile);
 
     // is command line option 'show annotation dialog' specified?
-    TQString annotateFile = KCmdLineArgs::parsedArgs()->getOption("annotate");
+    TQString annotateFile = TDECmdLineArgs::parsedArgs()->getOption("annotate");
     if( !annotateFile.isEmpty() )
         return ShowAnnotateDialog(annotateFile);
 
@@ -188,7 +188,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     } else {
         CervisiaShell* shell = new CervisiaShell();
 
-        const KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+        const TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
         if( args->count() )
         {
             KURL directory = args->url(0);