diff options
Diffstat (limited to 'kcontrol/keys/main.cpp')
| -rw-r--r-- | kcontrol/keys/main.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index d002b667f..b54ffb5cd 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -25,7 +25,8 @@ #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> +#include <dcopref.h> #include "commandShortcuts.h" #include "main.h" @@ -75,16 +76,16 @@ void KeyModule::initGUI() m_pShortcuts = new ShortcutsModule( this ); m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") ); - connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); m_pCommandShortcuts = new CommandShortcutsModule ( this ); m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") ); - connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); - connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) ); + connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); + connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) ); m_pModifiers = new ModifiersModule( this ); m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") ); - connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); } void KeyModule::load() @@ -146,7 +147,7 @@ TQString KeyModule::handbookSection() const extern "C" { - KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 TDEGlobal::locale()->insertCatalogue("twin"); @@ -155,7 +156,7 @@ extern "C" return new KeyModule(parent, "kcmkeys"); } - KDE_EXPORT void initModifiers() + TDE_EXPORT void initModifiers() { kdDebug(125) << "KeyModule::initModifiers()" << endl; @@ -165,7 +166,7 @@ extern "C" ModifiersModule::setupMacModifierKeys(); } - KDE_EXPORT void init_keys() + TDE_EXPORT void init_keys() { kdDebug(125) << "KeyModule::init()\n"; @@ -181,9 +182,9 @@ extern "C" kdDebug(125) << "KeyModule::init() - Load Included Bindings\n"; // this should match the included files above #define NOSLOTS -#define SHIFT Qt::SHIFT -#define CTRL Qt::CTRL -#define ALT Qt::ALT +#define SHIFT TQt::SHIFT +#define CTRL TQt::CTRL +#define ALT TQt::ALT #include "../../klipper/klipperbindings.cpp" #include "../../twin/twinbindings.cpp" #define KICKER_ALL_BINDINGS |