diff options
author | Timothy Pearson <[email protected]> | 2013-02-06 19:44:17 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-06 19:44:17 -0600 |
commit | 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch) | |
tree | a5eb4cb7c4754e533de65c5adee17d783e426425 /kdesktop | |
parent | 98eb308fc180d9bea71f448b262ab796353ac904 (diff) | |
download | tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop')
-rw-r--r-- | kdesktop/kwebdesktop/kwebdesktop.cpp | 4 | ||||
-rw-r--r-- | kdesktop/kxdglauncher.cpp | 4 | ||||
-rw-r--r-- | kdesktop/lock/main.cc | 4 | ||||
-rw-r--r-- | kdesktop/main.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index cf1f4c6f4..5aae0c465 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -38,13 +38,13 @@ #include "kwebdesktop.moc" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+width", I18N_NOOP("Width of the image to create"), 0 }, { "+height", I18N_NOOP("Height of the image to create"), 0 }, { "+file", I18N_NOOP("File sname where to dump the output in png format"), 0 }, { "+[URL]", I18N_NOOP("URL to open (if not specified, it is read from kwebdesktoprc)"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url ) diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 4433ef367..0848f40a7 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -81,11 +81,11 @@ TQString getDocumentPath() return s_documentPath; } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "xdgname <argument>", I18N_NOOP("XDG variable name to open"), 0 }, { "getpath", I18N_NOOP("Do not launch Konqueror; instead print path to directory if it exists)"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv) diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 5481468f7..ae7500d1d 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -153,14 +153,14 @@ bool MyApp::x11EventFilter( XEvent *ev ) } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "forcelock", I18N_NOOP("Force session locking"), 0 }, { "dontlock", I18N_NOOP("Only start screensaver"), 0 }, { "securedialog", I18N_NOOP("Launch the secure dialog"), 0 }, { "blank", I18N_NOOP("Only use the blank screensaver"), 0 }, { "internal <pid>", I18N_NOOP("TDE internal command for background process loading"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; void restore_hidden_override_redirect_windows() { diff --git a/kdesktop/main.cc b/kdesktop/main.cc index e0f7d98d9..ce4b8115d 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -59,7 +59,7 @@ static const char description[] = static const char version[] = VERSION; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "x-root", I18N_NOOP("Use this if the desktop window appears as a real window"), 0 }, { "noautostart", I18N_NOOP("Obsolete"), 0 }, @@ -67,7 +67,7 @@ static KCmdLineOptions options[] = #ifdef COMPOSITE { "bg-transparency", I18N_NOOP("Enable background transparency"), 0 }, #endif - KCmdLineLastOption + TDECmdLineLastOption }; bool argb_visual = false; |