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_win.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_win.h')
| -rw-r--r-- | tdecore/kglobalaccel_win.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h index 414254881..e60fed8ee 100644 --- a/tdecore/kglobalaccel_win.h +++ b/tdecore/kglobalaccel_win.h @@ -23,27 +23,27 @@ #include <tqmap.h> #include <tqwidget.h> -#include "kaccelbase.h" +#include "tdeaccelbase.h" #include "kkeyserver.h" -#include "kshortcut.h" +#include "tdeshortcut.h" /** * @internal */ -class KGlobalAccelPrivate : public TQWidget, public KAccelBase +class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase { - friend class KGlobalAccel; + friend class TDEGlobalAccel; Q_OBJECT public: - KGlobalAccelPrivate(); - virtual ~KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); + virtual ~TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); virtual bool emitSignal( Signal signal ); - virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key ); + virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key ); virtual bool connectKey( const KKeyServer::Key& key ); - virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key ); + virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key ); virtual bool disconnectKey( const KKeyServer::Key& key ); protected: @@ -51,7 +51,7 @@ class KGlobalAccelPrivate : public TQWidget, public KAccelBase /** * @param bGrab Set to true to grab key, false to ungrab key. */ - bool grabKey( const KKeyServer::Key&, bool bGrab, KAccelAction* ); + bool grabKey( const KKeyServer::Key&, bool bGrab, TDEAccelAction* ); /** * Filters X11 events ev for key bindings in the accelerator dictionary. @@ -63,7 +63,7 @@ class KGlobalAccelPrivate : public TQWidget, public KAccelBase // virtual bool x11Event( XEvent* ); // void x11MappingNotify(); // bool x11KeyPress( const XEvent *pEvent ); - void activate( KAccelAction* pAction, const KKeySequence& seq ); + void activate( TDEAccelAction* pAction, const KKeySequence& seq ); virtual bool isEnabledInternal() const; static void blockShortcuts( bool block ); void disableBlocking( bool disable ); |