diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-03 14:08:11 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-03 14:08:11 +0100 |
| commit | 6e1aa998ea5d2f54c704fdbaad1008bb2472825e (patch) | |
| tree | 5f9ec954f12fb2dbb67fe6c2b3f96de5d042408e /qxt-mini | |
| parent | bb416dbd61c626f6656d9c79aa851a6b3fa6b5d9 (diff) | |
"fix" crapintosh build
Diffstat (limited to 'qxt-mini')
| -rw-r--r-- | qxt-mini/qxtglobalshortcut.cpp | 12 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut_p.h | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp index 72548d6f..44b9f917 100644 --- a/qxt-mini/qxtglobalshortcut.cpp +++ b/qxt-mini/qxtglobalshortcut.cpp @@ -33,17 +33,17 @@ #include <QAbstractEventDispatcher>
#include <QtDebug>
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
int QxtGlobalShortcutPrivate::ref = 0;
# if QT_VERSION < QT_VERSION_CHECK(5,0,0)
QAbstractEventDispatcher::EventFilter QxtGlobalShortcutPrivate::prevEventFilter = 0;
# endif
-#endif // Q_WS_MAC
+#endif // Q_OS_MAC
QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> QxtGlobalShortcutPrivate::shortcuts;
QxtGlobalShortcutPrivate::QxtGlobalShortcutPrivate() : enabled(true), key(Qt::Key(0)), mods(Qt::NoModifier)
{
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
if (ref == 0) {
# if QT_VERSION < QT_VERSION_CHECK(5,0,0)
prevEventFilter = QAbstractEventDispatcher::instance()->setEventFilter(eventFilter);
@@ -52,12 +52,12 @@ QxtGlobalShortcutPrivate::QxtGlobalShortcutPrivate() : enabled(true), key(Qt::Ke #endif
}
++ref;
-#endif // Q_WS_MAC
+#endif // Q_OS_MAC
}
QxtGlobalShortcutPrivate::~QxtGlobalShortcutPrivate()
{
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
--ref;
if (ref == 0) {
QAbstractEventDispatcher *ed = QAbstractEventDispatcher::instance();
@@ -69,7 +69,7 @@ QxtGlobalShortcutPrivate::~QxtGlobalShortcutPrivate() # endif
}
}
-#endif // Q_WS_MAC
+#endif // Q_OS_MAC
}
bool QxtGlobalShortcutPrivate::setShortcut(const QKeySequence& shortcut)
diff --git a/qxt-mini/qxtglobalshortcut_p.h b/qxt-mini/qxtglobalshortcut_p.h index 1a788852..0d88b354 100644 --- a/qxt-mini/qxtglobalshortcut_p.h +++ b/qxt-mini/qxtglobalshortcut_p.h @@ -59,14 +59,16 @@ public: bool unsetShortcut();
static bool error;
-#ifndef Q_WS_MAC
+#ifndef Q_OS_DARWIN
static int ref;
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+# if QT_VERSION < QT_VERSION_CHECK(5,0,0)
static QAbstractEventDispatcher::EventFilter prevEventFilter;
static bool eventFilter(void* message);
-#else
+# else
virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
-#endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
+# endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
+# else
+ virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) {}
#endif // Q_WS_MAC
static void activateShortcut(quint32 nativeKey, quint32 nativeMods);
|