diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/joystick | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/joystick')
| -rw-r--r-- | kcontrol/joystick/joystick.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/joystick/joystick.h | 2 |
2 files changed, 3 insertions, 3 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); } //--------------------------------------------------------------------------------------------- diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h index 0f412efb3..2a201b28f 100644 --- a/kcontrol/joystick/joystick.h +++ b/kcontrol/joystick/joystick.h @@ -25,7 +25,7 @@ class JoyWidget; -class joystick: public KCModule +class joystick: public TDECModule { Q_OBJECT |