summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-06 19:44:05 -0600
committerTimothy Pearson <[email protected]>2013-02-06 19:44:05 -0600
commit72fa4d867755de40115f176774478957a19405d7 (patch)
treee7e1ba84558d7322ae896d446cbc05e1bd8a66b0
parent7efbb306c69cd2f29e38bf75090d2d87cb32e97d (diff)
downloadtdeartwork-72fa4d867755de40115f176774478957a19405d7.tar.gz
tdeartwork-72fa4d867755de40115f176774478957a19405d7.zip
Rename KCmd to avoid conflicts with KDE4
-rw-r--r--tdescreensaver/kxsconfig/kxsconfig.cpp4
-rw-r--r--tdescreensaver/kxsconfig/kxsrun.cpp4
-rw-r--r--tdescreensaver/xsavers/main.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index 520d177a..d5f0ac53 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.cpp
+++ b/tdescreensaver/kxsconfig/kxsconfig.cpp
@@ -317,11 +317,11 @@ static const char description[] = I18N_NOOP("TDE X Screen Saver Configuration to
static const char version[] = "3.0.0";
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{"+screensaver", I18N_NOOP("Filename of the screen saver to configure"), 0},
{"+[savername]", I18N_NOOP("Optional screen saver name used in messages"), 0},
- KCmdLineLastOption
+ TDECmdLineLastOption
};
static const char *defaults[] = {
diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp
index 6cc473ef..82ead267 100644
--- a/tdescreensaver/kxsconfig/kxsrun.cpp
+++ b/tdescreensaver/kxsconfig/kxsrun.cpp
@@ -50,11 +50,11 @@ static const char description[] = I18N_NOOP("TDE X Screen Saver Launcher");
static const char version[] = "3.0.0";
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{"+screensaver", I18N_NOOP("Filename of the screen saver to start"), 0},
{"+-- [options]", I18N_NOOP("Extra options to pass to the screen saver"), 0},
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char *argv[])
diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp
index 6ebb0e2d..053e6584 100644
--- a/tdescreensaver/xsavers/main.cpp
+++ b/tdescreensaver/xsavers/main.cpp
@@ -28,13 +28,13 @@ static const char appName[] = "klock";
static const char description[] = I18N_NOOP("TDE Screen Lock/Saver");
static const char version[] = "2.0.0";
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{ "setup", I18N_NOOP("Setup screen saver"), 0 },
{ "window-id wid", I18N_NOOP("Run in the specified XWindow"), 0 },
{ "root", I18N_NOOP("Run in the root XWindow"), 0 },
{ "demo", I18N_NOOP("Start screen saver in demo mode"), "default"},
- KCmdLineLastOption
+ TDECmdLineLastOption
};
static void crashHandler( int /*sig*/ )