diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:31 -0600 |
| commit | fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 (patch) | |
| tree | aa0c8d74da1f6fbe13337d07bdf046ef3df80e35 /kscd | |
| parent | ce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff) | |
| download | tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/kscd.cpp | 4 | ||||
| -rw-r--r-- | kscd/kscdmagic/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 6c26e1d3..cc9bc389 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -1605,9 +1605,9 @@ static const KCmdLineOptions options[] = */ int main( int argc, char *argv[] ) { - KAboutData aboutData("kscd", I18N_NOOP("KsCD"), + TDEAboutData aboutData("kscd", I18N_NOOP("KsCD"), KSCDVERSION, description, - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2001, Dirk Försterling\n(c) 2003, Aaron J. Seigo"); aboutData.addAuthor("Aaron J. Seigo", I18N_NOOP("Current maintainer"), "[email protected]"); aboutData.addAuthor("Alexander Kern",I18N_NOOP("Workman library update, CDTEXT, CDDA"), "[email protected]"); diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp index 1c9a7eae..77a2e77c 100644 --- a/kscd/kscdmagic/main.cpp +++ b/kscd/kscdmagic/main.cpp @@ -188,9 +188,9 @@ main(int argc, char **argv) opterr = 0; /* - KAboutData aboutData( "kscdmagic", I18N_NOOP("kscdmagic"), + TDEAboutData aboutData( "kscdmagic", I18N_NOOP("kscdmagic"), KSCDMAGICVERSION, I18N_NOOP("sound visualisation"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2000, Dirk F�rsterling"); aboutData.addAuthor("Paul Harrison",0, "[email protected]"); aboutData.addAuthor("Dirk F�rsterling",0, "[email protected]"); |