diff --git a/src/hotkeywrapper.cc b/src/hotkeywrapper.cc index 5efe49cd..e97a3a61 100644 --- a/src/hotkeywrapper.cc +++ b/src/hotkeywrapper.cc @@ -107,7 +107,7 @@ HotkeyStruct::HotkeyStruct( quint32 key_, quint32 key2_, quint32 modifier_, int ////////////////////////////////////////////////////////////////////////// -#if !defined( Q_OS_MAC ) && !defined( Q_WS_QWS ) +#if !defined( Q_OS_MAC ) HotkeyWrapper::HotkeyWrapper( QObject * parent ): QThread( parent ), state2( false ) diff --git a/src/hotkeywrapper.hh b/src/hotkeywrapper.hh index 718ef82a..2e113ddb 100644 --- a/src/hotkeywrapper.hh +++ b/src/hotkeywrapper.hh @@ -53,7 +53,6 @@ struct HotkeyStruct ////////////////////////////////////////////////////////////////////////// -#if !defined( Q_WS_QWS ) class HotkeyWrapper: public QThread // Thread is actually only used on X11 { Q_OBJECT @@ -168,40 +167,6 @@ signals: #endif }; -#else - -class HotkeyWrapper: public QObject -{ - Q_OBJECT - - friend class QHotkeyApplication; - -public: - - DEF_EX( exInit, "Hotkey wrapper failed to init", std::exception ) - - HotkeyWrapper( QObject * parent ): - QObject( parent ) - { - } - - bool setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier, int handle ) - { - return true; - } - - bool setGlobalKey( QKeySequence const &, int ) - { - return true; - } - - void unregister() {} - -signals: - - void hotkeyActivated( int ); -}; -#endif ////////////////////////////////////////////////////////////////////////// diff --git a/src/keyboardstate.cc b/src/keyboardstate.cc index c201b85b..ea236483 100644 --- a/src/keyboardstate.cc +++ b/src/keyboardstate.cc @@ -21,9 +21,7 @@ bool KeyboardState::checkModifiersPressed( int mask ) { -#if defined( Q_WS_QWS ) - return false; -#elif defined( Q_OS_WIN32 ) +#if defined( Q_OS_WIN32 ) return !( ( mask & Alt && !( GetAsyncKeyState( VK_MENU ) & 0x8000 ) ) || ( mask & Ctrl && !( GetAsyncKeyState( VK_CONTROL ) & 0x8000 ) )