Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

6 files changed, 13 insertions, 13 deletions

diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index aac6189a7..d57b8228b 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -12,7 +12,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
 
   about.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");
 
-  KCmdLineArgs::init( argc, argv, &about );
+  TDECmdLineArgs::init( argc, argv, &about );
 
   if (!KAccessApp::start())
     return 0;
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 0d74d9499..40013c166 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -118,13 +118,13 @@ int main(int argc, char ** argv)
   aboutData.addAuthor("Preston Brown",0, "pbrown@kde.org");
   aboutData.addAuthor("David Faure",0, "faure@kde.org");
 
-  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;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if (args->count() == 0)
-    KCmdLineArgs::usage();
+    TDECmdLineArgs::usage();
 
   TQString arg = args->arg(0);
 
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index ded07b006..e80f0603f 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -134,7 +134,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
   aboutData->addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
   aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org");
 
-  KCmdLineArgs::init( argc, argv, aboutData );
+  TDECmdLineArgs::init( argc, argv, aboutData );
   KUniqueApplication::addCmdLineOptions();
 
   KCGlobal::init();
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index c60934624..c225187fd 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -93,10 +93,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "craig@kde.org");
     setAboutData(about);
 
-    const char *appName=KCmdLineArgs::appName();
+    const char *appName=TDECmdLineArgs::appName();
 
     itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) &&
-                     KCmdLineArgs::parsedArgs()->isSet("embed"));
+                     TDECmdLineArgs::parsedArgs()->isSet("embed"));
 
     itsStatusLabel = new TQLabel(this);
     itsStatusLabel->setFrameShape(TQFrame::Panel);
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index 09617ade8..acfd96178 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -54,7 +54,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
         itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
 
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         KURL         openURL;
 
         if(args->count() > 0)
@@ -118,8 +118,8 @@ static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP(
 
 int main(int argc, char **argv)
 {
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KFI::CFontViewerApp::addCmdLineOptions();
 
     KFI::CFontViewerApp app;
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index b48232d2c..39903351b 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -42,8 +42,8 @@ int main(int argc, char **argv)
 	aboutData.setProductName("krandr/krandrtray");
 	KGlobal::locale()->setMainCatalogue("krandr");
 
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	KApplication::addCmdLineOptions();
 
 	KRandRApp app;