From 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:44:17 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- ksmserver/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ksmserver') 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 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 ", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'twin'"), 0}, { "windowmanageraddargs ", 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; -- cgit v1.2.1