diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:44:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:44:17 -0600 |
| commit | 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch) | |
| tree | a5eb4cb7c4754e533de65c5adee17d783e426425 /kicker/proxy | |
| parent | 98eb308fc180d9bea71f448b262ab796353ac904 (diff) | |
| download | tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip | |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kicker/proxy')
| -rw-r--r-- | kicker/proxy/appletproxy.cpp | 4 | ||||
| -rw-r--r-- | kicker/proxy/extensiondebugger.cpp | 4 | ||||
| -rw-r--r-- | kicker/proxy/extensionproxy.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 6c15e55ac..d9c92a9e0 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -60,12 +60,12 @@ KPanelApplet::Position directionToPosition( int d ) } } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+desktopfile", I18N_NOOP("The applet's desktop file"), 0 }, { "configfile <file>", I18N_NOOP("The config file to be used"), 0 }, { "callbackid <id>", I18N_NOOP("DCOP callback id of the applet container"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 8c63fd7a8..94998c571 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -42,10 +42,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+desktopfile", I18N_NOOP("The extensions desktop file"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; KPanelExtension* loadExtension(const AppletInfo& info) diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 7f8835d5f..fb7254d4d 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -46,12 +46,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/Xlib.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+desktopfile", I18N_NOOP("The extension's desktop file"), 0 }, { "configfile <file>", I18N_NOOP("The config file to be used"), 0 }, { "callbackid <id>", I18N_NOOP("DCOP callback id of the extension container"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) |