summaryrefslogtreecommitdiffstats
path: root/kcontrol/info/memory.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/info/memory.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/info/memory.cpp')
-rw-r--r--kcontrol/info/memory.cpp6
1 files changed, 3 insertions, 3 deletions
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]");