summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:44:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:44:17 -0600
commit5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch)
treea5eb4cb7c4754e533de65c5adee17d783e426425 /ksmserver
parent98eb308fc180d9bea71f448b262ab796353ac904 (diff)
downloadtdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz
tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 942c2fade..30a9ec1a3 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -29,7 +29,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
static const char version[] = "0.4";
static const char description[] = I18N_NOOP( "The reliable TDE session manager that talks the standard X11R6 \nsession management protocol (XSMP)." );
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{ "r", 0, 0 },
{ "restore", I18N_NOOP("Restores the saved user session if available"), 0},
@@ -37,7 +37,7 @@ static const KCmdLineOptions options[] =
{ "windowmanager <wm>", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'twin'"), 0},
{ "windowmanageraddargs <wm>", I18N_NOOP("Pass additional arguments to the window manager. Default is ''"), 0},
{ "nolocal", I18N_NOOP("Also allow remote connections"), 0},
- KCmdLineLastOption
+ TDECmdLineLastOption
};
extern KSMServer* the_server;