summaryrefslogtreecommitdiffstats
path: root/kcontrol/style/kcmstyle.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/style/kcmstyle.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/style/kcmstyle.cpp')
-rw-r--r--kcontrol/style/kcmstyle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 78126222e..274113bfb 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -130,10 +130,10 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
KGlobal::dirs()->addResourceType("themes",
KStandardDirs::kde_default("data") + "kstyle/themes");
- KAboutData *about =
- new KAboutData( I18N_NOOP("kcmstyle"),
+ TDEAboutData *about =
+ new TDEAboutData( I18N_NOOP("kcmstyle"),
I18N_NOOP("TDE Style Module"),
- 0, 0, KAboutData::License_GPL,
+ 0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2002 Karol Szwed, Daniel Molkentin"));
about->addAuthor("Karol Szwed", 0, "gallium@kde.org");