Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 6e7786bdc3
commit 8c78497ddb

@ -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() &&

@ -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

@ -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()) {

Loading…
Cancel
Save