mirror of https://code.videolan.org/videolan/vlc
qt: remove obsolete version check in mainctx_win32
This commit is contained in:
parent
93aa095006
commit
5d93898cf5
|
@ -246,11 +246,7 @@ public:
|
|||
return qRound(static_cast<qreal>(8) * window->devicePixelRatio());
|
||||
}
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
bool nativeEventFilter(const QByteArray &, void *message, qintptr *result) override
|
||||
#else
|
||||
bool nativeEventFilter(const QByteArray &, void *message, long *result) override
|
||||
#endif
|
||||
{
|
||||
MSG* msg = static_cast<MSG*>( message );
|
||||
|
||||
|
@ -669,11 +665,7 @@ void WinTaskbarWidget::createTaskBarButtons()
|
|||
changeThumbbarButtons( THEMIM->getPlayingState() );
|
||||
}
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */)
|
||||
#else
|
||||
bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, long* /* result */)
|
||||
#endif
|
||||
{
|
||||
MSG * msg = static_cast<MSG*>( message );
|
||||
if (msg->hwnd != WinId(m_window))
|
||||
|
@ -913,11 +905,7 @@ bool InterfaceWindowHandlerWin32::eventFilter(QObject* obj, QEvent* ev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
|
||||
#else
|
||||
bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, long *result)
|
||||
#endif
|
||||
{
|
||||
MSG* msg = static_cast<MSG*>( message );
|
||||
|
||||
|
|
|
@ -36,11 +36,7 @@ public:
|
|||
virtual ~WinTaskbarWidget();
|
||||
|
||||
private:
|
||||
#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
|
||||
void createTaskBarButtons();
|
||||
|
||||
private slots:
|
||||
|
@ -81,11 +77,7 @@ public:
|
|||
bool eventFilter(QObject*, QEvent* event) override;
|
||||
|
||||
protected:
|
||||
#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:
|
||||
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
|
||||
|
|
Loading…
Reference in New Issue