Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

4 files changed, 20 insertions, 20 deletions

diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index f8533ef17..dd7e385e3 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -70,16 +70,16 @@ static const KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 {
-  KCmdLineArgs::init(argc, argv, appName, programName, description, version, false);
+  TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false);
 
-  KCmdLineArgs::addCmdLineOptions( options );
-  KCmdLineArgs::addTempFileOption();
+  TDECmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addTempFileOption();
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->isSet("commands") )
   {
-    KCmdLineArgs::enable_i18n();
+    TDECmdLineArgs::enable_i18n();
     puts(i18n("\nSyntax:\n").local8Bit());
     puts(i18n("  kfmclient openURL 'url' ['mimetype']\n"
                 "            # Opens a window showing 'url'.\n"
@@ -445,7 +445,7 @@ static void checkArgumentCount(int count, int min, int max)
 
 bool clientApp::doIt()
 {
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   int argc = args->count();
   checkArgumentCount(argc, 1, 0);
 
@@ -466,7 +466,7 @@ bool clientApp::doIt()
 	KApplication::dcopClient()->attach();
     }
     checkArgumentCount(argc, 1, 3);
-    bool tempFile = KCmdLineArgs::isTempFileSet();
+    bool tempFile = TDECmdLineArgs::isTempFileSet();
     if ( argc == 1 )
     {
       KURL url;
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index d34794fdc..bea3c0e26 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -66,8 +66,8 @@ int main( int argc, char**argv )
 	aboutData.addAuthor( "Frerich Raabe", I18N_NOOP( "Original author" ),
 	                     "raabe@kde.org" );
 
-	KCmdLineArgs::init( argc, argv, &aboutData );
-	KCmdLineArgs::addCmdLineOptions( cmdLineOptions );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::addCmdLineOptions( cmdLineOptions );
 
 	if ( !kdeRunning ) {
 		KApplication::disableAutoDcopRegistration();
@@ -75,7 +75,7 @@ int main( int argc, char**argv )
 	KApplication app( false, false );
 	app.disableSessionManagement();
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	if ( args->count() != 1 ) {
 		kdError() << "No directory to scan for bookmarks specified." << endl;
 		return 1;
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 5b238302f..b99313159 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -121,11 +121,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
     aboutData.addAuthor("David Faure", I18N_NOOP("Initial author"), "faure@kde.org");
     aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "lypanov@kde.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
     KApplication::addCmdLineOptions();
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     bool isGui = !(args->isSet("exportmoz") || args->isSet("exportns") || args->isSet("exporthtml") 
                 || args->isSet("exportie") || args->isSet("exportopera")
                 || args->isSet("importmoz") || args->isSet("importns")
@@ -160,12 +160,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
             Q_ASSERT(arg2);
             // TODO - maybe an xbel export???
             if (got > 1) // got == 0 isn't possible as !isGui is dependant on "export.*"
-                KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option."));
+                TDECmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option."));
             TQString path = TQString::fromLocal8Bit(args->getOption(arg2));
             CurrentMgr::self()->doExport(exportType, path);
         } else if (importType) {
             if (got > 1) // got == 0 isn't possible as !isGui is dependant on "import.*"
-                KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option."));
+                TDECmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option."));
             TQString path = TQString::fromLocal8Bit(args->getOption(arg2));
             ImportCommand *importer = ImportCommand::importerFactory(importType);
             importer->import(path, true);
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index 6e98bf104..7e7a11ae4 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cc
@@ -50,10 +50,10 @@ static const KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() );
+  TDECmdLineArgs::init( argc, argv, KonqFactory::aboutData() );
 
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-  KCmdLineArgs::addTempFileOption();
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::addTempFileOption();
 
   KonquerorApplication app;
 
@@ -65,7 +65,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
   KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
   KImageIO::registerFormats();
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log");
   KonqMainWindow::s_crashlog_file = crashlog_file.file();
@@ -191,7 +191,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
                            urlToOpen.setFileName("");
                         }
                      }
-                     const bool tempFile = KCmdLineArgs::isTempFileSet();
+                     const bool tempFile = TDECmdLineArgs::isTempFileSet();
                      mainwin = KonqMisc::createNewWindow( urlToOpen, urlargs, false, filesToSelect, tempFile );
                  } else
                      urlList += urlToOpen;