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 /kcontrol/colors/colorscm.cpp | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/colors/colorscm.cpp')
-rw-r--r-- | kcontrol/colors/colorscm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 4212112cc..041be096d 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -279,8 +279,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis load(); - KAboutData* about = new KAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0, - KAboutData::License_GPL, + TDEAboutData* about = new TDEAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997-2005 Colors Developers"), 0, 0); about->addAuthor("Mark Donohoe", 0, 0); about->addAuthor("Matthias Hoelzer", 0, 0); |