summaryrefslogtreecommitdiffstats
path: root/kmix/kmixctrl.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 /kmix/kmixctrl.cpp
parentce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff)
downloadtdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz
tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmix/kmixctrl.cpp')
-rw-r--r--kmix/kmixctrl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index b602b5b3..60c27c48 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KLocale::setMainCatalogue("kmix");
- KAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
- APP_VERSION, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"),
+ APP_VERSION, description, TDEAboutData::License_GPL,
"(c) 2000 by Stefan Schimanski");
aboutData.addAuthor("Stefan Schimanski", 0, "1Stein@gmx.de");