diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:59 -0600 |
| commit | 049e19e6194d8e18db569d6b0c8287aa8a412977 (patch) | |
| tree | bfa7a56f15917cb122f38d24bc5003e648563340 | |
| parent | 3edbf7b350a3e413da61319bc915e0d080fdd8f4 (diff) | |
| download | rosegarden-049e19e6194d8e18db569d6b0c8287aa8a412977.tar.gz rosegarden-049e19e6194d8e18db569d6b0c8287aa8a412977.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | src/gui/application/main.cpp | 4 | ||||
| -rw-r--r-- | src/sequencer/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index bb1c4c2..c1aac43 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -412,8 +412,8 @@ int main(int argc, char *argv[]) srandom((unsigned int)time(0) * (unsigned int)getpid()); - KAboutData aboutData( "rosegarden", I18N_NOOP("Rosegarden"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "rosegarden", I18N_NOOP("Rosegarden"), + 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"), 0, "http://www.rosegardenmusic.com/", diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp index a69c744..384784b 100644 --- a/src/sequencer/main.cpp +++ b/src/sequencer/main.cpp @@ -82,9 +82,9 @@ int main(int argc, char *argv[]) sigaddset(&_signals, SIGUSR2); pthread_sigmask(SIG_BLOCK, &_signals, 0); - KAboutData aboutData( "rosegardensequencer", + TDEAboutData aboutData( "rosegardensequencer", I18N_NOOP("RosegardenSequencer"), - VERSION, description, KAboutData::License_GPL, + VERSION, description, TDEAboutData::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"); TDECmdLineArgs::init( argc, argv, &aboutData ); |