diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:32 -0600 |
| commit | 8c78497ddbb61e72239a7ef5e0e56804455ea712 (patch) | |
| tree | ee428c01565d35c47230317144b47a0e4ee479c4 | |
| parent | 6e7786bdc3a10933c8becf83de4fee4bf5e466c7 (diff) | |
| download | rosegarden-8c78497ddbb61e72239a7ef5e0e56804455ea712.tar.gz rosegarden-8c78497ddbb61e72239a7ef5e0e56804455ea712.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | src/gui/application/RosegardenApplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/application/main.cpp | 6 | ||||
| -rw-r--r-- | src/sequencer/main.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp index 0168ae6..d94cbcd 100644 --- a/src/gui/application/RosegardenApplication.cpp +++ b/src/gui/application/RosegardenApplication.cpp @@ -51,7 +51,7 @@ namespace Rosegarden int RosegardenApplication::newInstance() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (RosegardenGUIApp::self() && args->count() && RosegardenGUIApp::self()->getDocument() && diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 5f6a0ff..2d58cd7 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -468,8 +468,8 @@ int main(int argc, char *argv[]) aboutData.setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\nYour names") , I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails")); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KUniqueApplication::addCmdLineOptions(); // Add KUniqueApplication options. if (!RosegardenApplication::start()) @@ -487,7 +487,7 @@ int main(int argc, char *argv[]) // Parse cmd line args // - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (!args->isSet("ignoreversion")) { // Give up immediately if we haven't been installed or if the diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp index dd97510..c931bae 100644 --- a/src/sequencer/main.cpp +++ b/src/sequencer/main.cpp @@ -87,13 +87,13 @@ int main(int argc, char *argv[]) VERSION, description, KAboutData::License_GPL, "(c) 2000-2008, Guillaume Laurent, Chris Cannam, Richard Bown"); aboutData.addAuthor("Guillaume Laurent, Chris Cannam, Richard Bown", 0, "glaurent@telegraph-road.org, cannam@all-day-breakfast.com, bownie@bownie.com"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. // Parse cmd line args // - /*KCmdLineArgs *args =*/ - KCmdLineArgs::parsedArgs(); + /*TDECmdLineArgs *args =*/ + TDECmdLineArgs::parsedArgs(); KApplication app; if (app.isRestored()) { |