diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:38 -0600 |
| commit | f27c6b92859f7d7c845aae72472a63e4cc61be63 (patch) | |
| tree | 3469eafe2f7ebc5e24d0f5f0273a8e67f136973d /lilo-config/kde | |
| parent | 7b8d362cad90c47665dc2f749dd430d9cb9eccb4 (diff) | |
| download | tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.tar.gz tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lilo-config/kde')
| -rw-r--r-- | lilo-config/kde/kcontrol.cpp | 4 | ||||
| -rw-r--r-- | lilo-config/kde/kcontrol.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp index 846edc8..0c38f47 100644 --- a/lilo-config/kde/kcontrol.cpp +++ b/lilo-config/kde/kcontrol.cpp @@ -45,8 +45,8 @@ KControl::KControl(TQWidget *parent, const char *name) if (getuid() != 0) { m->makeReadOnly(); } - KAboutData *about = new KAboutData(I18N_NOOP("kcmlilo"), I18N_NOOP("LILO Configuration"), - 0, 0, KAboutData::License_GPL, + TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmlilo"), I18N_NOOP("LILO Configuration"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2000, Bernhard Rosenkraenzer")); about->addAuthor("Bernhard \"Bero\" Rosenkraenzer", 0, "bero@redhat.com"); setAboutData(about); diff --git a/lilo-config/kde/kcontrol.h b/lilo-config/kde/kcontrol.h index 7a75905..b9c1073 100644 --- a/lilo-config/kde/kcontrol.h +++ b/lilo-config/kde/kcontrol.h @@ -34,7 +34,7 @@ #include <kcmodule.h> #include "mainwidget.h" -class KAboutData; +class TDEAboutData; class KControl: public KCModule { Q_OBJECT |