summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:33 -0600
commit201e831d6d5b086b43d9f9dba0a0ae8c74e4f2a3 (patch)
tree83466931bbe6cb61325959b035c45c4c15e3e463 /src
parent7f5f522e98edd9b4c0f38b516898e9de82814e8a (diff)
downloadtdesvn-201e831d6d5b086b43d9f9dba0a0ae8c74e4f2a3.tar.gz
tdesvn-201e831d6d5b086b43d9f9dba0a0ae8c74e4f2a3.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/askpass/tdesvn-askpass.cpp8
-rw-r--r--src/commandline.cpp2
-rw-r--r--src/commandline.h6
-rw-r--r--src/commandline_part.cpp2
-rw-r--r--src/commandline_part.h4
-rw-r--r--src/main.cpp6
-rw-r--r--src/svnfrontend/commandexec.cpp4
-rw-r--r--src/svnfrontend/commandexec.h4
-rw-r--r--src/tdesvn_part.cpp2
-rw-r--r--src/tdesvn_part.h4
-rw-r--r--src/tdesvnd/main.cpp4
11 files changed, 23 insertions, 23 deletions
diff --git a/src/askpass/tdesvn-askpass.cpp b/src/askpass/tdesvn-askpass.cpp
index 581ecf6..d717d9e 100644
--- a/src/askpass/tdesvn-askpass.cpp
+++ b/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();
diff --git a/src/commandline.cpp b/src/commandline.cpp
index fd49ca9..c9e9f78 100644
--- a/src/commandline.cpp
+++ b/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;
diff --git a/src/commandline.h b/src/commandline.h
index 5edec07..ce01437 100644
--- a/src/commandline.h
+++ b/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;
};
diff --git a/src/commandline_part.cpp b/src/commandline_part.cpp
index f26613b..7a30285 100644
--- a/src/commandline_part.cpp
+++ b/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");
diff --git a/src/commandline_part.h b/src/commandline_part.h
index 00d00b3..00b7139 100644
--- a/src/commandline_part.h
+++ b/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:
diff --git a/src/main.cpp b/src/main.cpp
index d02c27a..a2f0156 100644
--- a/src/main.cpp
+++ b/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;
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 596311b..45e4850 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/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;
diff --git a/src/svnfrontend/commandexec.h b/src/svnfrontend/commandexec.h
index 38ba9c4..7455ea7 100644
--- a/src/svnfrontend/commandexec.h
+++ b/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();
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index 0c08329..18b05d9 100644
--- a/src/tdesvn_part.cpp
+++ b/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
diff --git a/src/tdesvn_part.h b/src/tdesvn_part.h
index c84dc06..53ae82c 100644
--- a/src/tdesvn_part.h
+++ b/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:
diff --git a/src/tdesvnd/main.cpp b/src/tdesvnd/main.cpp
index 9aad1c7..fa18d41 100644
--- a/src/tdesvnd/main.cpp
+++ b/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())