Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

6 files changed, 17 insertions, 17 deletions

diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 8ceceaf37..34341cbfe 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -75,11 +75,11 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KGlobal::locale()->setMainCatalogue( "kasbarextension" );
   KApplication app;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   kdDebug(1345) << "Kasbar starting..." << endl;
 
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 9bcf455be..4dc4c9864 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -125,7 +125,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     aboutData.addCredit("Jessica Hall", /* I18N_NOOP("KConfigXT") */ 0, "jes.hall@kdemail.net");
     aboutData.addCredit("Stefan Nikolaus", /* I18N_NOOP("Bug fixes") */ 0, "stefan.nikolaus@kdemail.net");
     aboutData.addCredit("Benoît Minisini", /* I18N_NOOP("Bug fixes") */ 0, "gambas@users.sourceforge.net");
-    KCmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
 
     if (!Kicker::start()) {
 	kdError() << "kicker is already running!" << endl;
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index 97a35aff6..110e1692f 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -22,7 +22,7 @@ typedef TQMap<TQString, AppletInfo> AppletInfoMap;
 int main(int argc, char** argv)
 {
     // We must disguise as Kicker in order to obtain the correct reverseLayout setting.
-    KCmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
+    TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false);
     KApplication app(false, false);
 
     TQStringList stretchableApplets;
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index e427cbe74..04e81612e 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -75,11 +75,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
                           ,I18N_NOOP("Panel applet proxy.")
                           , KAboutData::License_BSD
                           , "(c) 2000, The KDE Developers");
-    KCmdLineArgs::init(argc, argv, &aboutData );
+    TDECmdLineArgs::init(argc, argv, &aboutData );
     aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
     aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
     KApplication::addCmdLineOptions();
-    KCmdLineArgs::addCmdLineOptions(options); // Add our own options.
+    TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
     KApplication a;
     a.disableSessionManagement();
@@ -91,10 +91,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     AppletProxy proxy(0, "appletproxywidget");
 
     // parse cmdline args
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if ( args->count() == 0 )
-        KCmdLineArgs::usage(i18n("No desktop file specified") );
+        TDECmdLineArgs::usage(i18n("No desktop file specified") );
 
     // Perhaps we should use a konsole-like solution here (shell, list of args...)
     TQString desktopfile( args->arg(0) );
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index 796f10c93..4fa1d8332 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -79,11 +79,11 @@ int main( int argc, char ** argv )
                           ,I18N_NOOP("Panel extension proxy.")
                           , KAboutData::License_BSD
                           , "(c) 2000, The KDE Developers");
-    KCmdLineArgs::init(argc, argv, &aboutData );
+    TDECmdLineArgs::init(argc, argv, &aboutData );
     aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
     aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
     KApplication::addCmdLineOptions();
-    KCmdLineArgs::addCmdLineOptions(options); // Add our own options.
+    TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
     KApplication a;
     a.disableSessionManagement();
@@ -94,11 +94,11 @@ int main( int argc, char ** argv )
     TQString df;
 
     // parse cmdline args
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // sanity check
     if ( args->count() == 0 )
-        KCmdLineArgs::usage(i18n("No desktop file specified") );
+        TDECmdLineArgs::usage(i18n("No desktop file specified") );
 
 
     TQCString desktopFile = TQCString( args->arg(0) );
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 0bce08e91..eab6f4bb4 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -61,11 +61,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
                           ,I18N_NOOP("Panel extension proxy")
                           , KAboutData::License_BSD
                           , "(c) 2000, The KDE Developers");
-    KCmdLineArgs::init(argc, argv, &aboutData );
+    TDECmdLineArgs::init(argc, argv, &aboutData );
     aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");
     aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
     KApplication::addCmdLineOptions();
-    KCmdLineArgs::addCmdLineOptions(options); // Add our own options.
+    TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
     KApplication a;
     a.disableSessionManagement();
@@ -77,11 +77,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     ExtensionProxy proxy(0, "extensionproxywidget");
 
     // parse cmdline args
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // sanity check
     if ( args->count() == 0 )
-        KCmdLineArgs::usage(i18n("No desktop file specified") );
+        TDECmdLineArgs::usage(i18n("No desktop file specified") );
 
     // do we have a callback id?
     if (args->getOption("callbackid").isNull()) {