Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

src/askpass/tdesvn-askpass.cpp

@@ -37,8 +37,8 @@ int main(int argc, char** argv)
                     I18N_NOOP("ssh-askpass for tdesvn"),
                     KAboutData::License_LGPL,
                     I18N_NOOP("Copyright (c) 2005 Rajko Albrecht"));
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     // no need to register with the dcop server
     KApplication::disableAutoDcopRegistration();
 
@@ -47,10 +47,10 @@ int main(int argc, char** argv)
     app.disableSessionManagement();
     TQString prompt;
 
-    if( !KCmdLineArgs::parsedArgs()->count() ) {
+    if( !TDECmdLineArgs::parsedArgs()->count() ) {
         prompt = i18n("Please enter your password below.");
     } else {
-        prompt = KCmdLineArgs::parsedArgs()->arg(0);
+        prompt = TDECmdLineArgs::parsedArgs()->arg(0);
     }
     TQCString pw;
     KPasswordDialog::disableCoreDumps();

src/commandline.cpp

@@ -40,7 +40,7 @@ public:
     TQString cmd;
 };
 
-CommandLine::CommandLine(KCmdLineArgs*_args)
+CommandLine::CommandLine(TDECmdLineArgs*_args)
 {
     m_args = _args;
     m_data = new CommandLineData;

src/commandline.h

@@ -20,7 +20,7 @@
 #ifndef COMMANDLINE_H
 #define COMMANDLINE_H
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class CommandLineData;
 
 /**
@@ -28,13 +28,13 @@ class CommandLineData;
 */
 class CommandLine{
 public:
-    CommandLine(KCmdLineArgs*);
+    CommandLine(TDECmdLineArgs*);
     virtual ~CommandLine();
 
     virtual int exec();
 
 protected:
-    KCmdLineArgs*m_args;
+    TDECmdLineArgs*m_args;
     CommandLineData*m_data;
 };
 

src/commandline_part.cpp

@@ -23,7 +23,7 @@
 
 #include <kstandarddirs.h>
 
-commandline_part::commandline_part(TQObject *parent, const char *name,KCmdLineArgs *args)
+commandline_part::commandline_part(TQObject *parent, const char *name,TDECmdLineArgs *args)
  : TQObject(parent, name)
 {
     KGlobal::locale()->insertCatalogue("tdesvn");

src/commandline_part.h

@@ -23,7 +23,7 @@
 #include <tqobject.h>
 
 class CommandExec;
-class KCmdLineArgs;
+class TDECmdLineArgs;
 
 /**
 @author Rajko Albrecht
@@ -33,7 +33,7 @@ class commandline_part : public TQObject
     Q_OBJECT
   
 public:
-    commandline_part(TQObject *parent, const char *name, KCmdLineArgs *args);
+    commandline_part(TQObject *parent, const char *name, TDECmdLineArgs *args);
     virtual ~commandline_part();
     virtual int exec();
 private:

src/main.cpp

@@ -54,8 +54,8 @@ int main(int argc, char **argv)
     about.setHomepage("http://tdesvn.alwins-world.de/");
     about.setBugAddress("tdesvn-bugs@alwins-world.de");
 
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
 
     KApplication app;
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             tdesvn *widget = new tdesvn;

src/svnfrontend/commandexec.cpp

@@ -59,7 +59,7 @@ public:
     bool force;
     int log_limit;
     SvnActions*m_SvnWrapper;
-    KCmdLineArgs *args;
+    TDECmdLineArgs *args;
     svn::Revision start,end;
 
     // for output
@@ -91,7 +91,7 @@ pCPart::~pCPart()
     delete disp;
 }
 
-CommandExec::CommandExec(TQObject*parent, const char *name,KCmdLineArgs *args)
+CommandExec::CommandExec(TQObject*parent, const char *name,TDECmdLineArgs *args)
     : TQObject(parent,name)
 {
     m_pCPart = new pCPart;

src/svnfrontend/commandexec.h

@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class KURL;
 class pCPart;
 
@@ -39,7 +39,7 @@ class CommandExec : public TQObject
 Q_OBJECT
   
 public:
-    CommandExec(TQObject*parent,const char *name,KCmdLineArgs *args);
+    CommandExec(TQObject*parent,const char *name,TDECmdLineArgs *args);
     virtual ~CommandExec();
     virtual int exec();
 

src/tdesvn_part.cpp

@@ -439,7 +439,7 @@ KInstance* cFactory::instance()
     return s_instance;
 }
 
-commandline_part*cFactory::createCommandIf(TQObject*parent,const char*name, KCmdLineArgs *args)
+commandline_part*cFactory::createCommandIf(TQObject*parent,const char*name, TDECmdLineArgs *args)
 {
     if (!s_cline) {
         // no emit of creation - we will delete this object in destructor

src/tdesvn_part.h

@@ -106,7 +106,7 @@ protected slots:
 };
 
 class commandline_part;
-class KCmdLineArgs;
+class TDECmdLineArgs;
 
 /* we make it ourself 'cause we will enhance a little bit! */
 class KDESVN_EXPORT cFactory : public KParts::Factory
@@ -122,7 +122,7 @@ public:
     virtual KParts::Part* createAppPart( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
-    virtual commandline_part*createCommandIf(TQObject*parent,const char*name, KCmdLineArgs *args);
+    virtual commandline_part*createCommandIf(TQObject*parent,const char*name, TDECmdLineArgs *args);
     static KInstance* instance();
 
 private:

src/tdesvnd/main.cpp

@@ -46,8 +46,8 @@ int main (int argc, char *argv[])
                 KAboutData::License_GPL, "(C) %{YEAR}, Rajko Albrecht");
     aboutdata.addAuthor("Rajko Albrecht",I18N_NOOP("Developer"),"rajko.albrecht@tecways.com");
 
-    KCmdLineArgs::init( argc, argv, &aboutdata );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutdata );
+    TDECmdLineArgs::addCmdLineOptions( options );
     KUniqueApplication::addCmdLineOptions();
 
     if (!KUniqueApplication::start())