From 159ce83873a5fa6dcb83ff797c6fc1ea925af195 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:32:47 -0600 Subject: [PATCH] Rename KCmd to avoid conflicts with KDE4 --- kaffeine/src/kaffeine.cpp | 4 ++-- kaffeine/src/kaffeine.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index aae2eca..d76f596 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -98,7 +98,7 @@ #include #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 }; diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h index c90a158..85136dc 100644 --- a/kaffeine/src/kaffeine.h +++ b/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 {