From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kcontrol/style/kcmstyle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kcontrol/style/kcmstyle.cpp') 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"); -- cgit v1.2.1