diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:26 -0600 |
| commit | fbfe699023a0839506892a8447b3f128eca37cc8 (patch) | |
| tree | 24c1aa3f8224b66101a101db55d8bab88a38e7b1 | |
| parent | 9494a37f4a70427b8a9251485b570e40e7ca8811 (diff) | |
| download | kaffeine-fbfe699023a0839506892a8447b3f128eca37cc8.tar.gz kaffeine-fbfe699023a0839506892a8447b3f128eca37cc8.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | kaffeine/src/kaffeine.cpp | 4 | ||||
| -rw-r--r-- | kaffeine/src/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index 6679b97..8edd3a6 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -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") { diff --git a/kaffeine/src/main.cpp b/kaffeine/src/main.cpp index 970c2eb..33c3e62 100644 --- a/kaffeine/src/main.cpp +++ b/kaffeine/src/main.cpp @@ -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; |