diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/info | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/info')
| -rw-r--r-- | kcontrol/info/info.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/info/memory.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index d29ae64f9..017f9477b 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -402,10 +402,10 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const : KCModule(parent, name), title(_title) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcminfo"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcminfo"), I18N_NOOP("TDE Panel System Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998 - 2002 Helge Deller")); about->addAuthor("Helge Deller", 0, "[email protected]"); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index e7acd2856..483f7dd1d 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -91,10 +91,10 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) : KCModule(parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcminfo"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcminfo"), I18N_NOOP("TDE Panel Memory Information Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998 - 2002 Helge Deller")); about->addAuthor("Helge Deller", 0, "[email protected]"); |