summaryrefslogtreecommitdiffstats
path: root/kcontrol/joystick/joystick.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/joystick/joystick.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/joystick/joystick.cpp')
-rw-r--r--kcontrol/joystick/joystick.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 190e33c7b..9a622c667 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -69,9 +69,9 @@ extern "C"
joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(JoystickFactory::instance(), parent, name)
{
- setAboutData( new KAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
+ setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
I18N_NOOP("TDE Control Center Module to test Joysticks"),
- KAboutData::License_GPL, "(c) 2004, Martin Koller",
+ TDEAboutData::License_GPL, "(c) 2004, Martin Koller",
setQuickHelp( i18n("<h1>Joystick</h1>"