Rename KCmd to avoid conflicts with KDE4

kaffeine/src/kaffeine.cpp

@@ -98,7 +98,7 @@
 #include <X11/extensions/XTest.h>
 #endif
 
-const KCmdLineOptions cmdLineOptions[] = {
+const TDECmdLineOptions cmdLineOptions[] = {
 	{ "p", 0, 0 },
 	{ "play", I18N_NOOP("Start playing immediately"), 0 },
 	{ "f", 0, 0 },
@@ -116,7 +116,7 @@ const KCmdLineOptions cmdLineOptions[] = {
 	{ "wizard", I18N_NOOP("Run installation wizard"), 0 },
 	{ "tempfile", I18N_NOOP("tempfile to delete after use"), 0 },
 	{ "+[file]", I18N_NOOP("File(s) to play. Can be a local file, a URL, a directory or 'DVD', 'VCD', 'AudioCD', 'DVB'."), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 

kaffeine/src/kaffeine.h

@@ -35,7 +35,7 @@
 #include "kaffeineiface.h"
 
 class TDEActionMenu;
-class KCmdLineOptions;
+class TDECmdLineOptions;
 class TDERecentFilesAction;
 class TDEToggleAction;
 class TDEToggleFullScreenAction;
@@ -51,7 +51,7 @@ class PlayerContainer;
 class StartWindow;
 class SystemTray;
 
-extern const KCmdLineOptions cmdLineOptions[];
+extern const TDECmdLineOptions cmdLineOptions[];
 
 class Kaffeine : public TDEMainWindow, private KaffeineIface
 {