Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

ark/arkapp.cpp

@@ -120,7 +120,7 @@ ArkApplication::newInstance()
     // another window on startup.
     if (restoringSession()) return 0;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if ( args->isSet( "extract-to" ) )
     {
@@ -133,7 +133,7 @@ ArkApplication::newInstance()
         }
         else
         {
-            KCmdLineArgs::usage( i18n( "Wrong number of arguments specified" ) );
+            TDECmdLineArgs::usage( i18n( "Wrong number of arguments specified" ) );
             return 0;
         }
     }
@@ -142,7 +142,7 @@ ArkApplication::newInstance()
     {
         if ( args->count() < 2 )
         {
-            KCmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) );
+            TDECmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) );
             return 0;
         }
         else
@@ -185,7 +185,7 @@ ArkApplication::newInstance()
     {
         if ( args->count() < 1 )
         {
-            KCmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) );
+            TDECmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) );
             return 0;
         }
         else
@@ -205,7 +205,7 @@ ArkApplication::newInstance()
     int i = 0;
     KURL url;
     bool doAutoExtract = args->isSet("extract");
-    bool tempFile = KCmdLineArgs::isTempFileSet();
+    bool tempFile = TDECmdLineArgs::isTempFileSet();
     do
     {
         if (args->count() > 0)

ark/main.cpp

@@ -105,9 +105,9 @@ extern "C" KDE_EXPORT int kdemain( int argc, char *argv[]  )
 	                     I18N_NOOP( "Ideas, help with the icons" ),
 	                     "smitty@absamail.co.za" );
 
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KCmdLineArgs::addCmdLineOptions( option );
+	TDECmdLineArgs::addCmdLineOptions( option );
-	KCmdLineArgs::addTempFileOption();
+	TDECmdLineArgs::addTempFileOption();
 
 	if ( !ArkApplication::start() )
 	{

kcalc/kcalc.cpp

@@ -2285,7 +2285,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 	aboutData.addAuthor("Charles Samuels", 0, "charles@altair.dhs.org");
 	/* Rene Merou */
 	aboutData.addAuthor("Ren" "\xc3\xa9" " M" "\xc3\xa9"  "rou", 0, "ochominutosdearco@yahoo.es");
-	KCmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::init(argc, argv, &aboutData);
 
 	KApplication app;
 #if 0

kcharselect/main.cc

@@ -27,7 +27,7 @@ int main(int argc, char **argv)
   aboutData.addCredit( "Ryan Cumming", I18N_NOOP( "GUI cleanup and fixes" ),
         "bodnar42@phalynx.dhs.org" );
   aboutData.addCredit("Benjamin C. Meyer",I18N_NOOP("XMLUI conversion"),"ben+kcharselect@meyerhome.net");
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 

kdelirc/irkick/main.cpp

@@ -26,7 +26,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 	aboutData->addCredit("Zsolt Rizsanyi", I18N_NOOP("Random patches"), "rizsanyi@myrealbox.com");
 	aboutData->addCredit("Antonio Larrosa Jiménez", I18N_NOOP("Ideas"), "larrosa@kde.org");
 
-	KCmdLineArgs::init( argc, argv, aboutData );
+	TDECmdLineArgs::init( argc, argv, aboutData );
 	KUniqueApplication::addCmdLineOptions();
 	KUniqueApplication app;
 	KGlobal::locale()->insertCatalogue( "kdelirc" );

kdessh/kdessh.cpp

@@ -55,11 +55,11 @@ int main(int argc, char *argv[])
     aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"),
 	    "jansen@kde.org", "http://www.stack.nl/~geertj/");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
     KApplication app;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // Stop daemon and exit?
     if (args->isSet("q"))
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
     }
 
     if (args->count() < 2)
-	KCmdLineArgs::usage(i18n("No command or host specified."));
+	TDECmdLineArgs::usage(i18n("No command or host specified."));
 
     // Check if ssh is available
     if (KStandardDirs::findExe(TQString::fromLatin1("ssh")).isEmpty())

kdf/kconftest.cpp

@@ -47,7 +47,7 @@ static const char version[] = "v0.0.1";
 
 main(int argc, char ** argv)
 {
- KCmdLineArgs::init(argc, argv, "test", description, version);
+ TDECmdLineArgs::init(argc, argv, "test", description, version);
  
  KApplication app;
  KConfig * cfg = kapp->config();

kdf/kdf.cpp

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
     version, description, KAboutData::License_GPL,
     "(c) 1998-2001, Michael Kropfberger");
   aboutData.addAuthor("Michael Kropfberger",0, "michael.kropfberger@gmx.net");
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 

kdf/kwikdisk.cpp

@@ -329,8 +329,8 @@ int main(int argc, char **argv)
    about.addAuthor( "Espen Sand", I18N_NOOP("TDE 2 changes"), "" );
    about.addAuthor( "Stanislav Karchebny", I18N_NOOP("TDE 3 changes"),
                     "Stanislav.Karchebny@kdemail.net" );
-   KCmdLineArgs::init(argc, argv, &about);
+   TDECmdLineArgs::init(argc, argv, &about);
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
    KApplication app;
    KwikDisk *mainWin = 0;
 

kedit/kedit.cpp

@@ -1267,8 +1267,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
 		KEDITVERSION, description, KAboutData::License_GPL,
 		"(c) 1997-2000, Bernd Johannes Wuebben");
 	aboutData.addAuthor("Bernd Johannes Wuebben",0, "wuebben@kde.org");
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::addCmdLineOptions( options );
 
 	KApplication a;
 	//CT KIO::Job::initStatic();
@@ -1286,7 +1286,7 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
 	else
 	{
 		have_top_window = false;
-		KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		const TQString encoding = args->getOption("encoding");
 		const bool doEncoding = args->isSet("encoding") &&

kfloppy/main.cpp

@@ -56,10 +56,10 @@ int main( int argc, char *argv[] )
   aboutData.addCredit("Adriaan de Groot", I18N_NOOP("Add BSD support"), "groot@kde.org");
   aboutData.addCredit("Nicolas Goutte", I18N_NOOP("Make KFloppy work again for KDE 3.4"), "goutte@kde.org");
   
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQString device;
   if (args->count()) {
 	device = args->arg(0);

kgpg/kgpg.cpp

@@ -887,7 +887,7 @@ void KgpgAppletApp::wizardOver(TQString defaultKeyId)
 int KgpgAppletApp::newInstance()
 {
         kdDebug(2100)<<"New instance"<<endl;
-        args = KCmdLineArgs::parsedArgs();
+        args = TDECmdLineArgs::parsedArgs();
         if (running) {
                 kdDebug(2100)<<"Already running"<<endl;
                 kgpg_applet->show();

kgpg/kgpg.h

@@ -141,7 +141,7 @@ private slots:
 	void checkMenu();
 };
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 
 class KgpgAppletApp : public KUniqueApplication
 {
@@ -157,7 +157,7 @@ public:
 	KShortcut goHome;
 
 protected:
-        KCmdLineArgs *args;
+        TDECmdLineArgs *args;
 private:
         kgpgapplet *kgpg_applet;
         class listKeys *s_keyManager;

kgpg/main.cpp

@@ -50,8 +50,8 @@ int main(int argc, char *argv[])
         KAboutData about("kgpg", I18N_NOOP("KGpg"), version, description,
                          KAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle");
         about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" );
-        KCmdLineArgs::init(argc, argv, &about);
+        TDECmdLineArgs::init(argc, argv, &about);
-        KCmdLineArgs::addCmdLineOptions(options);
+        TDECmdLineArgs::addCmdLineOptions(options);
         KUniqueApplication::addCmdLineOptions();
 
 

khexedit/main.cc

@@ -67,8 +67,8 @@ int main( int argc, char **argv )
     "\n"
     "Edward Livingston-Blade, sbcs@bigfoot.com, has given me very good\n"
     "reports which removed some nasty bugs.\n"));
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( option );
+  TDECmdLineArgs::addCmdLineOptions( option );
 
   KApplication app;
 
@@ -87,7 +87,7 @@ int main( int argc, char **argv )
 
     hexEdit->show();
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("offset"))
     {

kjots/main.cpp

@@ -49,7 +49,7 @@ int main( int argc, char **argv )
   aboutData.addAuthor("Aaron J. Seigo", 0, "aseigo@kde.org");
   aboutData.addAuthor("Stanislav Kljuhhin", 0, "crz@starman.ee");
   aboutData.addAuthor("Christoph Neerfeld", I18N_NOOP("Original author"), "chris@kde.org");
-  KCmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
   KUniqueApplication::addCmdLineOptions();
 
   if (!KUniqueApplication::start())

klaptopdaemon/laptop_check.cpp

@@ -42,7 +42,7 @@ main(int argc, char **argv)
 		            version, description, KAboutData::License_GPL,
 			            "(c) 2003, Paul Campbell");
     aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com");
-    KCmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
 
     KApplication a;
     daemon_state s;

kregexpeditor/main.cpp

@@ -39,7 +39,7 @@ int main( int argc, char* argv[] )
                           "1.0", I18N_NOOP("Editor for Regular Expressions"),
 			  KAboutData::License_GPL,
                           "(c) 2002-2003 Jesper K. Pedersen");
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
     KApplication myapp;
 #endif
 

kregexpeditor/test-without-dl/main.cpp

@@ -44,7 +44,7 @@ public:
 
 int main( int argc, char* argv[] )
 {
-  KCmdLineArgs::init(argc, argv, "RegExp Example","","");
+  TDECmdLineArgs::init(argc, argv, "RegExp Example","","");
   KApplication myapp( argc, argv );
 
   tqApp->installEventFilter( new ShootABug() );

ktimer/main.cpp

@@ -34,7 +34,7 @@ int main( int argc, char **argv )
                           version, description, KAboutData::License_GPL,
                           "(c) 2001, Stefan Schimanski");
     aboutData.addAuthor("Stefan Schimanski",0, "schimmi@kde.org");
-    KCmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
 
     KApplication app;
 

kwallet/main.cpp

@@ -57,8 +57,8 @@ int main(int argc, char **argv) {
 	about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "staikos@kde.org");
 	about.addAuthor("Isaac Clerencia", I18N_NOOP("Developer"), "isaac@warp.es");
 
-	KCmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::addCmdLineOptions(options);
 
 	if (!KUniqueApplication::start()) {
 		return 0;
@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
 
 	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	if (args->isSet("show")) {
 		wm.show();

superkaramba/src/karambaapp.cpp

@@ -252,7 +252,7 @@ void KarambaApplication::checkPreviousSession(KApplication &app,
   }
 }
 
-void KarambaApplication::checkCommandLine(KCmdLineArgs *args, TQStringList &lst)
+void KarambaApplication::checkCommandLine(TDECmdLineArgs *args, TQStringList &lst)
 {
   /******
     Not a saved session - check for themes given on command line

superkaramba/src/karambaapp.h

@@ -30,7 +30,7 @@
 
 class karamba;
 class KarambaIface;
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class ThemesDlg;
 class dcopIface_stub;
 class KHelpMenu;
@@ -67,7 +67,7 @@ class KarambaApplication : public KApplication
     void initDcopStub(TQCString app = "");
     void setUpSysTray(KAboutData* about);
     void checkPreviousSession(KApplication &app, TQStringList &lst);
-    void checkCommandLine(KCmdLineArgs *args, TQStringList &lst);
+    void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst);
     bool startThemes(TQStringList &lst);
     KarambaIface* dcopIface() { return iface; };
     dcopIface_stub* dcopStub() { return dcopIfaceStub; };

superkaramba/src/main.cpp

@@ -99,11 +99,11 @@ int main(int argc, char **argv)
     about.addAuthor("Petri Damstén", 0, "petri.damsten@iki.fi");
     about.addAuthor("Alexander Wiedenbruch", 0, "mail@wiedenbruch.de");
     about.addAuthor("Luke Kenneth Casson Leighton", 0, "lkcl@lkcl.net");
-    KCmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KarambaSessionManaged ksm;
     //karamba *mainWin = 0;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     TQStringList lst;
     int ret = 0;
 

superkaramba/src/taskbartest.cpp

@@ -53,13 +53,13 @@ int main(int argc, char **argv)
     KAboutData about("karamba", I18N_NOOP("karamba"), version, description,
                      KAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se");
     about.addAuthor( "Hans Karlsson", 0, "karlsson.h@home.se" );
-    KCmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 //     karamba *mainWin = 0;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 //     //KSGRD::SensorManager *f32 = new KSGRD::SensorManager();
 //     //f32->engage("localhost");