diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kicker/kicker/core | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker/kicker/core')
-rw-r--r-- | kicker/kicker/core/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 82f82502c..1085bd430 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -107,8 +107,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) else appname.sprintf("kicker-screen-%d", kicker_screen_number); - KAboutData aboutData( appname.data(), I18N_NOOP("TDE Panel"), - version, description, KAboutData::License_GPL_V2, + TDEAboutData aboutData( appname.data(), I18N_NOOP("TDE Panel"), + version, description, TDEAboutData::License_GPL_V2, I18N_NOOP("(c) 1999-2010, The KDE Team") ); aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Current maintainer"), "kb9vqf@pearsoncomputing.net"); |