summaryrefslogtreecommitdiffstats
path: root/kscd/kscd.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:31 -0600
commitfcd5041fd6bf0cea48980d8a035468b2cdb5fff2 (patch)
treeaa0c8d74da1f6fbe13337d07bdf046ef3df80e35 /kscd/kscd.cpp
parentce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff)
downloadtdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz
tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kscd/kscd.cpp')
-rw-r--r--kscd/kscd.cpp4
1 files changed, 2 insertions, 2 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"), "aseigo@kde.org");
aboutData.addAuthor("Alexander Kern",I18N_NOOP("Workman library update, CDTEXT, CDDA"), "kernalex@kde.org");