Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

4 files changed, 13 insertions, 13 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index f57bd2254..2553000a1 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -51,7 +51,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-KateApp::KateApp (KCmdLineArgs *args)
+KateApp::KateApp (TDECmdLineArgs *args)
  : KApplication ()
  , m_args (args)
  , m_shouldExit (false)
@@ -192,7 +192,7 @@ bool KateApp::startupKate ()
 
   TQTextCodec *codec = m_args->isSet("encoding") ? TQTextCodec::codecForName(m_args->getOption("encoding")) : 0;
 
-  bool tempfileSet = KCmdLineArgs::isTempFileSet();
+  bool tempfileSet = TDECmdLineArgs::isTempFileSet();
 
   Kate::Document::setOpenErrorDialogsActivated (false);
   uint id = 0;
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index b67901cd9..ffbd56e3e 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -33,7 +33,7 @@ namespace Kate {
   class Application;
 }
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 
 /**
  * Kate Application
@@ -51,7 +51,7 @@ class KDE_EXPORT KateApp : public KApplication
      * application constructor
      * @param args parsed command line args
      */
-    KateApp (KCmdLineArgs *args);
+    KateApp (TDECmdLineArgs *args);
 
     /**
      * application destructor
@@ -202,7 +202,7 @@ class KDE_EXPORT KateApp : public KApplication
     /**
      * kate's command line args
      */
-    KCmdLineArgs *m_args;
+    TDECmdLineArgs *m_args;
 
     /**
      * plugin interface
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 9dbcc3d43..28f293509 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -99,13 +99,13 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
   aboutData.setTranslator(I18N_NOOP2("NAME OF TRANSLATORS","Your names"), I18N_NOOP2("EMAIL OF TRANSLATORS","Your emails"));
 
   // command line args init and co
-  KCmdLineArgs::init (argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions (options);
-  KCmdLineArgs::addTempFileOption();
+  TDECmdLineArgs::init (argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions (options);
+  TDECmdLineArgs::addTempFileOption();
   KateApp::addCmdLineOptions ();
 
   // get our command line args ;)
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
   // now, first try to contact running kate instance if needed
   if ( args->isSet("use") || (::getenv("KATE_PID")!=0) )
@@ -172,7 +172,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 
       TQString enc = args->isSet("encoding") ? args->getOption("encoding") : TQCString("");
 
-      bool tempfileSet = KCmdLineArgs::isTempFileSet();
+      bool tempfileSet = TDECmdLineArgs::isTempFileSet();
 
       for (int z=0; z<args->count(); z++)
         kRef.call( "openURL", args->url(z), enc, tempfileSet );
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index ca54ec29f..dd2768b1a 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -588,8 +588,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
   aboutData.setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"), I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"));
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication a;
 
@@ -602,7 +602,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     client->registerAs("kwrite");
   }
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if (kapp->isRestored())
   {