diff options
Diffstat (limited to 'src/plugins')
6 files changed, 0 insertions, 24 deletions
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp b/src/plugins/qnx/camera/bbcameraorientationhandler.cpp index a4c7b43ba..d600f3db0 100644 --- a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp +++ b/src/plugins/qnx/camera/bbcameraorientationhandler.cpp @@ -76,11 +76,7 @@ BbCameraOrientationHandler::~BbCameraOrientationHandler() QCoreApplication::eventDispatcher()->removeNativeEventFilter(this); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, qintptr *) -#else -bool BbCameraOrientationHandler::nativeEventFilter(const QByteArray&, void *message, long *) -#endif { bps_event_t* const event = static_cast<bps_event_t*>(message); if (!event || bps_event_get_domain(event) != orientation_get_domain()) diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.h b/src/plugins/qnx/camera/bbcameraorientationhandler.h index a98582d84..af80bd4e1 100644 --- a/src/plugins/qnx/camera/bbcameraorientationhandler.h +++ b/src/plugins/qnx/camera/bbcameraorientationhandler.h @@ -51,11 +51,7 @@ public: explicit BbCameraOrientationHandler(QObject *parent = 0); ~BbCameraOrientationHandler(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; -#else - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; -#endif int orientation() const; diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/plugins/qnx/common/windowgrabber.cpp index f431f98a2..65037fcce 100644 --- a/src/plugins/qnx/common/windowgrabber.cpp +++ b/src/plugins/qnx/common/windowgrabber.cpp @@ -189,11 +189,7 @@ bool WindowGrabber::handleScreenEvent(screen_event_t screen_event) return false; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *) -#else -bool WindowGrabber::nativeEventFilter(const QByteArray &eventType, void *message, long *) -#endif { if (eventType == "screen_event_t") { const screen_event_t event = static_cast<screen_event_t>(message); diff --git a/src/plugins/qnx/common/windowgrabber.h b/src/plugins/qnx/common/windowgrabber.h index 5603d9634..c4c1f6a53 100644 --- a/src/plugins/qnx/common/windowgrabber.h +++ b/src/plugins/qnx/common/windowgrabber.h @@ -100,11 +100,7 @@ public: void pause(); void resume(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; -#else - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; -#endif bool handleScreenEvent(screen_event_t event); diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp index aff0bae51..b5c9804ab 100644 --- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp @@ -113,11 +113,7 @@ void MmrEventMediaPlayerControl::resetMonitoring() m_speed = 0; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) -#else -bool MmrEventMediaPlayerControl::nativeEventFilter(const QByteArray &eventType, void *message, long *result) -#endif { Q_UNUSED(result); if (eventType == "screen_event_t") { diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h index cb80ccbfc..e6c138f89 100644 --- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h +++ b/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h @@ -58,11 +58,7 @@ public: void stopMonitoring() override; void resetMonitoring() override; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; -#else - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; -#endif private Q_SLOTS: void readEvents(); |