summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:48 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:48 -0600
commit545d48dc2acbfb766a1c277b6f82ae54eea3754f (patch)
tree7b300309ee263157d3c34fd46d387cdc159fb14b
parent7adc7115528101c579c41266a2388a37e3b1c04c (diff)
downloadtdetoys-545d48dc2acbfb766a1c277b6f82ae54eea3754f.tar.gz
tdetoys-545d48dc2acbfb766a1c277b6f82ae54eea3754f.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r--amor/main.cpp2
-rw-r--r--kodo/main.cpp2
-rw-r--r--kteatime/main.cpp2
-rw-r--r--kweather/main.cpp4
-rw-r--r--kweather/reportmain.cpp6
-rw-r--r--kworldwatch/main.cpp10
-rw-r--r--kworldwatch/mapwidget.cpp2
7 files changed, 14 insertions, 14 deletions
diff --git a/amor/main.cpp b/amor/main.cpp
index 6075bbd..8a0ebe7 100644
--- a/amor/main.cpp
+++ b/amor/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
"(c) 1999, Martin R. Jones");
aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org");
aboutData.addAuthor("Gerardo Puga", I18N_NOOP("Current maintainer"), "gpuga@gioia.ing.unlp.edu.ar");
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
if (!KUniqueApplication::start()) {
fprintf(stderr, "%s is already running!\n", aboutData.appName());
diff --git a/kodo/main.cpp b/kodo/main.cpp
index 72f8802..92eb543 100644
--- a/kodo/main.cpp
+++ b/kodo/main.cpp
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
aboutData->addCredit("Gioele Barabucci",
I18N_NOOP("KDE 2 porting and some code cleanups"),
"dev@gioelebarabucci.com", "http://www.gioelebarabucci.com");
- KCmdLineArgs::init( argc, argv, aboutData );
+ TDECmdLineArgs::init( argc, argv, aboutData );
if (!KUniqueApplication::start())
exit(0);
diff --git a/kteatime/main.cpp b/kteatime/main.cpp
index 5baeb09..d9d31d5 100644
--- a/kteatime/main.cpp
+++ b/kteatime/main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
aboutData.addAuthor("Matthias Hoelzer-Kluepfel",0, "hoelzer@kde.org");
aboutData.addAuthor("Martin Willers", 0, "willers@xm-arts.de");
aboutData.addCredit("Daniel Teske", I18N_NOOP("Many patches"), "teske@bigfoot.com");
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
diff --git a/kweather/main.cpp b/kweather/main.cpp
index 3acf690..5b93485 100644
--- a/kweather/main.cpp
+++ b/kweather/main.cpp
@@ -15,8 +15,8 @@ int main (int argc, char *argv[])
aboutdata.addAuthor("Ian Reinhart Geiser",I18N_NOOP("Developer"),"geiseri@kde.org");
aboutdata.addAuthor("Nadeem Hasan",I18N_NOOP("Developer"),"nhasan@kde.org");
- KCmdLineArgs::init( argc, argv, &aboutdata );
- // KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init( argc, argv, &aboutdata );
+ // TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start())
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index 5a661a5..15c2534 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -27,9 +27,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
KGlobal::locale()->setMainCatalogue( "kweather" );
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options );
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 1 )
{
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index c301b56..03d2f2c 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -105,7 +105,7 @@ void WatchApplication::dumpMap()
// guess some default parameters
TQSize mapSize(kapp->desktop()->size());
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString themeName = args->getOption("theme");
TQCString outName = args->getOption("o");
@@ -136,7 +136,7 @@ void WatchApplication::dumpMap()
int WatchApplication::newInstance()
{
// dump mode, used for background drawing
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("dump"))
{
dumpMap();
@@ -176,11 +176,11 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData about("kworldclock", I18N_NOOP("TDE World Clock"), "1.5");
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions(options);
KUniqueApplication::addCmdLineOptions();
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("themes"))
{
KInstance app(&about);
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 75141b3..7dc10e2 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -179,7 +179,7 @@ void MapWidget::load(KConfig *config)
if ( !_applet )
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("theme"))
setTheme(TQString::fromLocal8Bit(args->getOption("theme")));
else