From 545d48dc2acbfb766a1c277b6f82ae54eea3754f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:48 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kworldwatch/main.cpp | 10 +++++----- kworldwatch/mapwidget.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kworldwatch') 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 -- cgit v1.2.1