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/konqhtml | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml')
-rw-r--r-- | kcontrol/konqhtml/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 28654869e..f1f28efca 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -78,9 +78,9 @@ extern "C" KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name) : KCModule(parent, name), mConfig(config) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999 - 2001 The Konqueror Developers")); about->addAuthor("Waldo Bastian",0,"bastian@kde.org"); |