summaryrefslogtreecommitdiffstats
path: root/kcontrol/access
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/access
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/access')
-rw-r--r--kcontrol/access/kcmaccess.cpp8
-rw-r--r--kcontrol/access/kcmaccess.h2
-rw-r--r--kcontrol/access/main.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 2279c9a78..1e28238a6 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -225,9 +225,9 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
: KCModule(parent, "kcmaccess")
{
- KAboutData *about =
- new KAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
- 0, 0, KAboutData::License_GPL,
+ TDEAboutData *about =
+ new TDEAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
+ 0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");
@@ -563,7 +563,7 @@ KAccessConfig::~KAccessConfig()
void KAccessConfig::configureKNotify()
{
- KAboutData about(I18N_NOOP("kaccess"),
+ TDEAboutData about(I18N_NOOP("kaccess"),
I18N_NOOP("TDE Accessibility Tool"),
0);
KNotifyDialog::configure (this, 0, &about);
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index 287514343..fac04aef4 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -22,7 +22,7 @@ class TQRadioButton;
class KColorButton;
class TQSlider;
class KNumInput;
-class KAboutData;
+class TDEAboutData;
class ExtendedIntNumInput : public KIntNumInput
{
diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index d57b8228b..9b29f9e6c 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -6,8 +6,8 @@
extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
{
- KAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
- 0, 0, KAboutData::License_GPL,
+ TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
+ 0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
about.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");