diff options
author | Timothy Pearson <[email protected]> | 2013-02-06 19:46:01 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-06 19:46:01 -0600 |
commit | 5466d52073af147d100482cbf633087bb9fb631b (patch) | |
tree | 80fee1fa39c51e63dfb213f52514fbec95c331bc /kded | |
parent | 84341c04865b27eaf78e082e1cca79a2c9d05262 (diff) | |
download | tdelibs-5466d52073af147d100482cbf633087bb9fb631b.tar.gz tdelibs-5466d52073af147d100482cbf633087bb9fb631b.zip |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kded')
-rw-r--r-- | kded/kded.cpp | 4 | ||||
-rw-r--r-- | kded/khostname.cpp | 4 | ||||
-rw-r--r-- | kded/tde-menu.cpp | 4 | ||||
-rw-r--r-- | kded/tdebuildsycoca.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kded/kded.cpp b/kded/kded.cpp index f54c4730c..774712e0e 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -730,11 +730,11 @@ void KHostnameD::checkHostname() } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "check", I18N_NOOP("Check Sycoca database only once"), 0 }, { "new-startup", "Internal", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; class KDEDQtDCOPObject : public DCOPObject diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 7bdc12858..227106eea 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -37,10 +37,10 @@ #include <kprocess.h> #include <kde_file.h> -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "+old", I18N_NOOP("Old hostname"), 0 }, { "+new", I18N_NOOP("New hostname"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "kdontchangethehostname"; diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp index e1f79f77c..fa2d220af 100644 --- a/kded/tde-menu.cpp +++ b/kded/tde-menu.cpp @@ -32,14 +32,14 @@ #include "kservicegroup.h" #include "kstandarddirs.h" -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 }, { "print-menu-id", I18N_NOOP("Print menu-id of the menu that contains\nthe application"), 0 }, { "print-menu-name", I18N_NOOP("Print menu name (caption) of the menu that\ncontains the application"), 0 }, { "highlight", I18N_NOOP("Highlight the entry in the menu"), 0 }, { "nocache-update", I18N_NOOP("Do not check if sycoca database is up to date"), 0 }, { "+<application-id>", I18N_NOOP("The id of the menu entry to locate"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "tde-menu"; diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index 87fdc0ba7..74eba4a1b 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -691,7 +691,7 @@ TQStringList KBuildSycoca::existingResourceDirs() return *dirs; } -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 }, { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 }, { "checkstamps", I18N_NOOP("Check file timestamps"), 0 }, @@ -703,7 +703,7 @@ static KCmdLineOptions options[] = { { "silent", I18N_NOOP("Silent - work without windows and stderr"), 0 }, { "showprogress", I18N_NOOP("Show progress information (even if 'silent' mode is on)"), 0 }, #endif - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "tdebuildsycoca"; |