Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 9494a37f4a
commit fbfe699023

@ -124,7 +124,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
m_mediaPart(NULL), m_playerContainer(NULL),
m_systemTray(NULL), m_videoSize(0,0), m_noResize(false), m_autoPaused(false)
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->getOption("audiodriver") != "default")
m_engineParameters.append("audioDriver=\"" + args->getOption("audiodriver") + "\"");
@ -268,7 +268,7 @@ Kaffeine::~Kaffeine()
void Kaffeine::updateArgs()
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQString device = args->getOption("device");
if (device != "default") {

@ -91,8 +91,8 @@ int main(int argc, char *argv[])
aboutData.addCredit("Giorgos Gousios", I18N_NOOP("Subtitle file import."), "gousiosg@cs.man.ac.uk");
aboutData.addCredit("Michael Rolf", I18N_NOOP("M3U import. Testing."), "mi.rolf@gmx.net");
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(cmdLineOptions);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(cmdLineOptions);
if (!KaffeineApp::start())
return 0;

Loading…
Cancel
Save