From 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 6 Feb 2013 19:44:17 -0600
Subject: Rename KCmd to avoid conflicts with KDE4

---
 kicker/proxy/appletproxy.cpp       | 4 ++--
 kicker/proxy/extensiondebugger.cpp | 4 ++--
 kicker/proxy/extensionproxy.cpp    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kicker/proxy')

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 )
-- 
cgit v1.2.1