Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 7f5f522e98
commit 201e831d6d

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

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

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

@ -23,7 +23,7 @@
#include <kstandarddirs.h> #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) : TQObject(parent, name)
{ {
KGlobal::locale()->insertCatalogue("tdesvn"); KGlobal::locale()->insertCatalogue("tdesvn");

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

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

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

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

@ -439,7 +439,7 @@ KInstance* cFactory::instance()
return s_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) { if (!s_cline) {
// no emit of creation - we will delete this object in destructor // no emit of creation - we will delete this object in destructor

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

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

Loading…
Cancel
Save