Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 3edbf7b350
commit 049e19e619

@ -412,8 +412,8 @@ int main(int argc, char *argv[])
srandom((unsigned int)time(0) * (unsigned int)getpid()); srandom((unsigned int)time(0) * (unsigned int)getpid());
KAboutData aboutData( "rosegarden", I18N_NOOP("Rosegarden"), TDEAboutData aboutData( "rosegarden", I18N_NOOP("Rosegarden"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("Copyright 2000 - 2008 Guillaume Laurent, Chris Cannam, Richard Bown\nParts copyright 1994 - 2004 Chris Cannam, Andy Green, Richard Bown, Guillaume Laurent\nLilyPond fonts copyright 1997 - 2005 Han-Wen Nienhuys and Jan Nieuwenhuizen"), I18N_NOOP("Copyright 2000 - 2008 Guillaume Laurent, Chris Cannam, Richard Bown\nParts copyright 1994 - 2004 Chris Cannam, Andy Green, Richard Bown, Guillaume Laurent\nLilyPond fonts copyright 1997 - 2005 Han-Wen Nienhuys and Jan Nieuwenhuizen"),
0, 0,
"http://www.rosegardenmusic.com/", "http://www.rosegardenmusic.com/",

@ -82,9 +82,9 @@ int main(int argc, char *argv[])
sigaddset(&_signals, SIGUSR2); sigaddset(&_signals, SIGUSR2);
pthread_sigmask(SIG_BLOCK, &_signals, 0); pthread_sigmask(SIG_BLOCK, &_signals, 0);
KAboutData aboutData( "rosegardensequencer", TDEAboutData aboutData( "rosegardensequencer",
I18N_NOOP("RosegardenSequencer"), I18N_NOOP("RosegardenSequencer"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
"(c) 2000-2008, Guillaume Laurent, Chris Cannam, Richard Bown"); "(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"); aboutData.addAuthor("Guillaume Laurent, Chris Cannam, Richard Bown", 0, "glaurent@telegraph-road.org, cannam@all-day-breakfast.com, bownie@bownie.com");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

Loading…
Cancel
Save