summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:42 -0600
commitde2e00ccad5e4f0ef40e88290954c8ccb7d518a5 (patch)
treeee1c5b249fc9f417b0637cd742374196a8fe5ac0
parent869edbbd8e9b3242a9d9a2eb698568be39d53a9a (diff)
downloadtdeartwork-de2e00ccad5e4f0ef40e88290954c8ccb7d518a5.tar.gz
tdeartwork-de2e00ccad5e4f0ef40e88290954c8ccb7d518a5.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r--kscreensaver/kxsconfig/kxsconfig.cpp6
-rw-r--r--kscreensaver/kxsconfig/kxsrun.cpp6
-rw-r--r--kscreensaver/xsavers/main.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index d1b3664b..4950c993 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -335,13 +335,13 @@ XrmDatabase db;
int main(int argc, char *argv[])
{
- KCmdLineArgs::init(argc, argv, appName, I18N_NOOP("KXSConfig"), description, version);
+ TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("KXSConfig"), description, version);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if(args->count()==0)
exit(1);
diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp
index b32dbfcc..fa1b9c3b 100644
--- a/kscreensaver/kxsconfig/kxsrun.cpp
+++ b/kscreensaver/kxsconfig/kxsrun.cpp
@@ -60,13 +60,13 @@ static const KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KLocale::setMainCatalogue("kxsconfig");
- KCmdLineArgs::init(argc, argv, appName, I18N_NOOP("KXSRun"), description, version);
+ TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("KXSRun"), description, version);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::addCmdLineOptions(options);
KApplication app( false, false );
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( !args->count() )
exit( 1 );
diff --git a/kscreensaver/xsavers/main.cpp b/kscreensaver/xsavers/main.cpp
index 14f0c952..ec9c361d 100644
--- a/kscreensaver/xsavers/main.cpp
+++ b/kscreensaver/xsavers/main.cpp
@@ -49,9 +49,9 @@ static void crashHandler( int /*sig*/ )
int main(int argc, char *argv[])
{
- KCmdLineArgs::init(argc, argv, appName, I18N_NOOP("KLock"), description, version);
+ TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("KLock"), description, version);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
DemoWindow *demoWidget = 0;
Window saveWin = 0;
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("setup"))
{