videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

qt: fix nativeEventFilter() signature

This commit is contained in:
Fatih Uzunoglu 2023-01-24 09:11:13 +01:00 committed by Jean-Baptiste Kempf
parent fd12435507
commit dc64361e71
7 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp
View File

@ -126,7 +126,11 @@ CompositorDCompositionAcrylicSurface::~CompositorDCompositionAcrylicSurface()
DestroyWindow(m_dummyWindow);
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &, void *message, qintptr *)
#else
bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &, void *message, long *)
#endif
{
MSG* msg = static_cast<MSG*>( message );

4
modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp
View File

@ -175,7 +175,11 @@ public:
~CompositorDCompositionAcrylicSurface();
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:
bool init(ID3D11Device *device);

4
modules/gui/qt/maininterface/compositor_win7.cpp
View File

@ -287,7 +287,11 @@ Win7NativeEventFilter::Win7NativeEventFilter(QObject* parent)
}
//parse native events that are not reported by Qt
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool Win7NativeEventFilter::nativeEventFilter(const QByteArray&, void* message, qintptr*)
#else
bool Win7NativeEventFilter::nativeEventFilter(const QByteArray&, void* message, long*)
#endif
{
MSG * msg = static_cast<MSG*>( message );

4
modules/gui/qt/maininterface/compositor_win7.hpp
View File

@ -34,7 +34,11 @@ class Win7NativeEventFilter : public QObject, public QAbstractNativeEventFilter
public:
Win7NativeEventFilter( QObject* parent = nullptr );
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */);
#else
bool nativeEventFilter(const QByteArray &, void *message, long* /* result */);
#endif
signals:
void windowStyleChanged();
};

14
modules/gui/qt/maininterface/mainctx_win32.cpp
View File

@ -246,7 +246,11 @@ 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 );
@ -665,7 +669,11 @@ 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))
@ -905,7 +913,11 @@ bool InterfaceWindowHandlerWin32::eventFilter(QObject* obj, QEvent* ev)
return ret;
}
bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, long *result)
#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 );

8
modules/gui/qt/maininterface/mainctx_win32.hpp
View File

@ -36,7 +36,11 @@ 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:
@ -77,7 +81,11 @@ 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

4
modules/gui/qt/style/windowsthemeprovider.cpp
View File

@ -50,7 +50,11 @@ public:
return !m_settings.value(WIN_THEME_SETTING_LIGHT_THEME_KEY).toBool();
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool nativeEventFilter(const QByteArray &, void *message, qintptr *)
#else
bool nativeEventFilter(const QByteArray &, void *message, long *)
#endif
{
MSG* msg = static_cast<MSG*>( message );
if ( msg->message == WM_SETTINGCHANGE