summaryrefslogtreecommitdiffstats
path: root/kcontrol/joystick/joystick.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/joystick/joystick.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket 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 9a622c667..f97fe8e51 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -67,7 +67,7 @@ extern "C"
//---------------------------------------------------------------------------------------------
joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
- : KCModule(JoystickFactory::instance(), parent, name)
+ : TDECModule(JoystickFactory::instance(), parent, name)
{
setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
I18N_NOOP("TDE Control Center Module to test Joysticks"),
@@ -97,7 +97,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
setMinimumSize(joyWidget->minimumSize());
- setButtons(KCModule::Default);
+ setButtons(TDECModule::Default);
}
//---------------------------------------------------------------------------------------------