diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/kglobalaccel_mac.h | |
parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/kglobalaccel_mac.h')
-rw-r--r-- | tdecore/kglobalaccel_mac.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h index 1bed4f3cc..b2803b0c0 100644 --- a/tdecore/kglobalaccel_mac.h +++ b/tdecore/kglobalaccel_mac.h @@ -3,14 +3,14 @@ #include <tqwidget.h> -#include "kshortcut.h" -#include "kaccelbase.h" +#include "tdeshortcut.h" +#include "tdeaccelbase.h" -class KGlobalAccelPrivate: public KAccelBase +class TDEGlobalAccelPrivate: public TDEAccelBase { public: - KGlobalAccelPrivate() - : KAccelBase(KAccelBase::NATIVE_KEYS) + TDEGlobalAccelPrivate() + : TDEAccelBase(TDEAccelBase::NATIVE_KEYS) {} // reimplemented pure virtuals @@ -18,11 +18,11 @@ public: { Q_UNUSED(bEnabled); } bool emitSignal( Signal signal ) { Q_UNUSED(signal); return false; } - bool connectKey( KAccelAction& action, const KKeyServer::Key& key) + bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key) { Q_UNUSED(action); Q_UNUSED(key); return false; } bool connectKey( const KKeyServer::Key& key) { Q_UNUSED(key); return false; } - bool disconnectKey( KAccelAction&, const KKeyServer::Key& key) + bool disconnectKey( TDEAccelAction&, const KKeyServer::Key& key) { Q_UNUSED(key); return false; } bool disconnectKey( const KKeyServer::Key& ) { return false; } |