summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:49 -0600
commitca1ec6eeaaf5744fae891a5b0696591bbaece795 (patch)
tree33109d2b950090bb7f320d20a115364514a08957
parent3240c45eaa4a785f0d90d5e712f4c51e53378117 (diff)
downloadtdewebdev-ca1ec6eeaaf5744fae891a5b0696591bbaece795.tar.gz
tdewebdev-ca1ec6eeaaf5744fae891a5b0696591bbaece795.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r--kfilereplace/main.cpp6
-rw-r--r--kimagemapeditor/main.cpp6
-rw-r--r--klinkstatus/src/main.cpp6
-rw-r--r--kommander/editor/main.cpp4
-rw-r--r--kommander/editor/mainwindow.cpp2
-rw-r--r--kommander/executor/main.cpp6
-rw-r--r--kommander/pluginmanager/main.cpp6
-rw-r--r--kxsldbg/kxsldbgpart/kxsldbg_part.cpp2
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp6
-rw-r--r--kxsldbg/main.cpp4
-rw-r--r--kxsldbg/xsldbgmain.cpp4
-rw-r--r--quanta/src/kqapp.cpp4
-rw-r--r--quanta/src/kqapp.h4
-rw-r--r--quanta/src/main.cpp8
14 files changed, 34 insertions, 34 deletions
diff --git a/kfilereplace/main.cpp b/kfilereplace/main.cpp
index 027894f9..1f7bdef0 100644
--- a/kfilereplace/main.cpp
+++ b/kfilereplace/main.cpp
@@ -44,8 +44,8 @@ int main(int argc, char *argv[])
I18N_NOOP("Original author of the KFileReplace tool"),
"dupoux@dupoux.com");
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app;
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
else
{
// no session.. just start up normally
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KFileReplace *kfr = new KFileReplace;
kfr->show();
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index 626a6e44..679ef7b2 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
aboutData.addCredit("Antonio Crevillen",I18N_NOOP("For the Spanish translation"));
aboutData.addCredit("Fabrice Mous",I18N_NOOP("For the Dutch translation"));
aboutData.addCredit("Germain Chazot",I18N_NOOP("For the French translation"));
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication a;
a.dcopClient()->registerAs(a.name());
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
}
else
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() == 0 )
{
KimeShell *kimeShell = new KimeShell();
diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp
index e8ec125a..e4535188 100644
--- a/klinkstatus/src/main.cpp
+++ b/klinkstatus/src/main.cpp
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
about.addCredit("Jens Herden", 0, "jens@tdewebdev.org");
about.addCredit("Helge Hielscher", 0, "hhielscher@unternehmen.com");
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app;
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
else
{
// no session.. just start up normally
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KLinkStatus *widget = new KLinkStatus;
widget->show();
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 641baac6..013e3b65 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -49,8 +49,8 @@ int main( int argc, char *argv[] )
aboutData.addAuthor("Marc Britton", I18N_NOOP("Original author"), "consume@optusnet.com.au");
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);
KommanderWidget::inEditor = true;
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 599807c3..8769f54d 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -1523,7 +1523,7 @@ void MainWindow::readConfig()
actionRecent->loadEntries(config, "Recent Files");
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
for(int i = 0; i < args->count(); i++)
{
TQFileInfo fi(args->url(i).path());
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 183118e8..a389ac57 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -61,9 +61,9 @@ int main(int argc, char *argv[])
aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");
aboutData.addAuthor("Michal Rudolf", I18N_NOOP("Previous maintainer"), "mrudolf@tdewebdev.org");
aboutData.addAuthor("Marc Britton", I18N_NOOP("Original author"), "consume@optusnet.com.au");
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("c"))
KLocale::setMainCatalogue(args->getOption("c"));
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index b1dbe8dd..d58c1af1 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -62,10 +62,10 @@ int main(int argc, char *argv[])
aboutData.addAuthor("Marc Britton", "Original author", "consume@optusnet.com.au");
aboutData.addAuthor("Eric Laffoon", "Project manager", "eric@tdewebdev.org");
aboutData.addAuthor("Michal Rudolf", "Current maintainer", "mrudolf@tdewebdev.org");
- KCmdLineArgs::init(argc, argv, &aboutData);
- KCmdLineArgs::addCmdLineOptions(options); // Add our own options.
+ TDECmdLineArgs::init(argc, argv, &aboutData);
+ TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KApplication app;
if (!args->getOption("add").isNull() || !args->getOption("remove").isNull() || args->isSet("check") || args->isSet("list"))
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 03a98596..23e17790 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -705,7 +705,7 @@ void KXsldbgPart::docChanged()
void KXsldbgPart::debuggerStarted()
{
if (configWidget != 0L){
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args){
int i=0, result=1, noFilesFound = 0;
TQString expandedName; /* contains file name with path expansion if any */
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 52066acf..312fdb4e 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -531,9 +531,9 @@ xsldbgMain(int argc, char **argv)
/* the xml document we're processing */
xmlDocPtr doc;
- KCmdLineArgs *args = 0;
+ TDECmdLineArgs *args = 0;
if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED)
- args = KCmdLineArgs::parsedArgs();
+ args = TDECmdLineArgs::parsedArgs();
errorFile = stderr;
@@ -699,7 +699,7 @@ xsldbgMain(int argc, char **argv)
}
if (!result) {
- KCmdLineArgs::usage();
+ TDECmdLineArgs::usage();
xsldbgFree();
return (1);
}
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index e15ed9af..3ac3558e 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -21,8 +21,8 @@ int main(int argc, char **argv)
{
KAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", 0, 0, "k_isdale@tpg.com.au");
about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( options );
KApplication app;
// see if we are starting with session management
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index 929171d0..efa924ba 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -129,8 +129,8 @@ int main(int argc, char **argv)
KAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au");
about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( options );
XsldbgApp app;
return app.exec();;
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index b39b0c46..a470dd13 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -62,7 +62,7 @@ KSplash::~KSplash()
KQApplication::KQApplication()
: KApplication()
{
- args = KCmdLineArgs::parsedArgs();
+ args = TDECmdLineArgs::parsedArgs();
splash = 0L;
KGlobal::dirs()->addPrefix(PREFIX);
@@ -132,7 +132,7 @@ KQUniqueApplication::~KQUniqueApplication()
int KQUniqueApplication::newInstance()
{
- args = KCmdLineArgs::parsedArgs();
+ args = TDECmdLineArgs::parsedArgs();
if (mainWidget())
{
KWin::activateWindow( mainWidget()->winId() );
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index b1b5f6df..ab154345 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -22,7 +22,7 @@
#include <tqframe.h>
#include <kuniqueapplication.h>
-class KCmdLineArgs;
+class TDECmdLineArgs;
class KSplashScreen;
class KSplash : public TQFrame
@@ -45,7 +45,7 @@ class KQApplicationPrivate
void init();
KSplash *splash;
- KCmdLineArgs *args;
+ TDECmdLineArgs *args;
KSplashScreen *sp;
};
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 3e11bacb..3b725f9d 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -177,10 +177,10 @@ int main(int argc, char *argv[])
I18N_NOOP("Splash screen and icon for 3.2"),
"luci@sh.ground.cz");
- KCmdLineArgs::init( argc, argv, &aboutData);
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs::init( argc, argv, &aboutData);
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- // this defeats the purpose of KCmdLineArgs, but there is no other
+ // this defeats the purpose of TDECmdLineArgs, but there is no other
// way around, I'm afraid.
const char *uniq = "--unique";
bool isUnique = false;
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
KUniqueApplication::dcopClient()->registerAs("quanta-foo");
if (KUniqueApplication::dcopClient()->isApplicationRegistered("quanta"))
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
for (int i = 0; i < args->count(); i++)
{
TQString s = args->url(i).url();