From 16e546e32fec393bc3b126f280114bcbfa7151ff Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 21 Jul 2020 12:16:09 +0200 Subject: Properly deprecate Qt::MidButton in favor of Qt::MiddleButton MidButton had its // ### Qt 5: remove me upgraded to Qt 6 at 5.0; but it dates back to 4.7.0 Replace the many remaining uses of MidButton with MiddleButton in the process. Pick-to: 5.15 Change-Id: Idc1b1b1816673dfdb344d703d101febc823a76ff Reviewed-by: Lars Knoll --- src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 2 +- src/plugins/platforms/directfb/qdirectfbconvenience.cpp | 4 ++-- src/plugins/platforms/vnc/qvnc.cpp | 2 +- src/plugins/platforms/windows/qwindowsmousehandler.cpp | 14 +++++++------- src/plugins/platforms/windows/qwindowspointerhandler.cpp | 14 +++++++------- src/plugins/platforms/xcb/qxcbconnection.cpp | 4 ++-- src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm index 3b5b5fc6f8..a975f2d76c 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm @@ -271,7 +271,7 @@ void QCocoaSystemTrayIcon::statusItemClicked() activationReason = QPlatformSystemTrayIcon::DoubleClick; } else { auto mouseButton = cocoaButton2QtButton(mouseEvent); - if (mouseButton == Qt::MidButton) + if (mouseButton == Qt::MiddleButton) activationReason = QPlatformSystemTrayIcon::MiddleClick; else if (mouseButton == Qt::RightButton) activationReason = QPlatformSystemTrayIcon::Context; diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp index f3e8282101..c67a76f989 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp @@ -136,7 +136,7 @@ Qt::MouseButton QDirectFbConvenience::mouseButton(DFBInputDeviceButtonIdentifier case DIBI_RIGHT: // value is 0x01 return Qt::RightButton; case DIBI_MIDDLE: // value is 0x02 - return Qt::MidButton; + return Qt::MiddleButton; case 0x03: return Qt::BackButton; case 0x04: @@ -198,7 +198,7 @@ Qt::MouseButtons QDirectFbConvenience::mouseButtons(DFBInputDeviceButtonMask mas buttons |= Qt::LeftButton; } if (mask & DIBM_MIDDLE) { - buttons |= Qt::MidButton; + buttons |= Qt::MiddleButton; } if (mask & DIBM_RIGHT) { buttons |= Qt::RightButton; diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp index aea8d26983..7d8649d12f 100644 --- a/src/plugins/platforms/vnc/qvnc.cpp +++ b/src/plugins/platforms/vnc/qvnc.cpp @@ -425,7 +425,7 @@ bool QRfbPointerEvent::read(QTcpSocket *s) if (buttonMask & 1) buttons |= Qt::LeftButton; if (buttonMask & 2) - buttons |= Qt::MidButton; + buttons |= Qt::MiddleButton; if (buttonMask & 4) buttons |= Qt::RightButton; diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index 5e2710bc28..02c59d4d27 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -143,7 +143,7 @@ Qt::MouseButtons QWindowsMouseHandler::queryMouseButtons() if (GetAsyncKeyState(VK_RBUTTON) < 0) result |= mouseSwapped ? Qt::LeftButton : Qt::RightButton; if (GetAsyncKeyState(VK_MBUTTON) < 0) - result |= Qt::MidButton; + result |= Qt::MiddleButton; if (GetAsyncKeyState(VK_XBUTTON1) < 0) result |= Qt::XButton1; if (GetAsyncKeyState(VK_XBUTTON2) < 0) @@ -187,11 +187,11 @@ static inline MouseEvent eventFromMsg(const MSG &msg) case WM_LBUTTONDBLCLK: // Qt QPA does not handle double clicks, send as press return {QEvent::MouseButtonPress, Qt::LeftButton}; case WM_MBUTTONDOWN: - return {QEvent::MouseButtonPress, Qt::MidButton}; + return {QEvent::MouseButtonPress, Qt::MiddleButton}; case WM_MBUTTONUP: - return {QEvent::MouseButtonRelease, Qt::MidButton}; + return {QEvent::MouseButtonRelease, Qt::MiddleButton}; case WM_MBUTTONDBLCLK: - return {QEvent::MouseButtonPress, Qt::MidButton}; + return {QEvent::MouseButtonPress, Qt::MiddleButton}; case WM_RBUTTONDOWN: return {QEvent::MouseButtonPress, Qt::RightButton}; case WM_RBUTTONUP: @@ -213,11 +213,11 @@ static inline MouseEvent eventFromMsg(const MSG &msg) case WM_NCLBUTTONDBLCLK: return {QEvent::NonClientAreaMouseButtonPress, Qt::LeftButton}; case WM_NCMBUTTONDOWN: - return {QEvent::NonClientAreaMouseButtonPress, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonPress, Qt::MiddleButton}; case WM_NCMBUTTONUP: - return {QEvent::NonClientAreaMouseButtonRelease, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonRelease, Qt::MiddleButton}; case WM_NCMBUTTONDBLCLK: - return {QEvent::NonClientAreaMouseButtonPress, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonPress, Qt::MiddleButton}; case WM_NCRBUTTONDOWN: return {QEvent::NonClientAreaMouseButtonPress, Qt::RightButton}; case WM_NCRBUTTONUP: diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp index d5c3aeacff..095aea2b95 100644 --- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp +++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp @@ -197,11 +197,11 @@ static inline MouseEvent eventFromMsg(const MSG &msg) case WM_LBUTTONDBLCLK: // Qt QPA does not handle double clicks, send as press return {QEvent::MouseButtonPress, Qt::LeftButton}; case WM_MBUTTONDOWN: - return {QEvent::MouseButtonPress, Qt::MidButton}; + return {QEvent::MouseButtonPress, Qt::MiddleButton}; case WM_MBUTTONUP: - return {QEvent::MouseButtonRelease, Qt::MidButton}; + return {QEvent::MouseButtonRelease, Qt::MiddleButton}; case WM_MBUTTONDBLCLK: - return {QEvent::MouseButtonPress, Qt::MidButton}; + return {QEvent::MouseButtonPress, Qt::MiddleButton}; case WM_RBUTTONDOWN: return {QEvent::MouseButtonPress, Qt::RightButton}; case WM_RBUTTONUP: @@ -223,11 +223,11 @@ static inline MouseEvent eventFromMsg(const MSG &msg) case WM_NCLBUTTONDBLCLK: return {QEvent::NonClientAreaMouseButtonPress, Qt::LeftButton}; case WM_NCMBUTTONDOWN: - return {QEvent::NonClientAreaMouseButtonPress, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonPress, Qt::MiddleButton}; case WM_NCMBUTTONUP: - return {QEvent::NonClientAreaMouseButtonRelease, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonRelease, Qt::MiddleButton}; case WM_NCMBUTTONDBLCLK: - return {QEvent::NonClientAreaMouseButtonPress, Qt::MidButton}; + return {QEvent::NonClientAreaMouseButtonPress, Qt::MiddleButton}; case WM_NCRBUTTONDOWN: return {QEvent::NonClientAreaMouseButtonPress, Qt::RightButton}; case WM_NCRBUTTONUP: @@ -265,7 +265,7 @@ static Qt::MouseButtons queryMouseButtons() if (GetAsyncKeyState(VK_RBUTTON) < 0) result |= mouseSwapped ? Qt::LeftButton : Qt::RightButton; if (GetAsyncKeyState(VK_MBUTTON) < 0) - result |= Qt::MidButton; + result |= Qt::MiddleButton; if (GetAsyncKeyState(VK_XBUTTON1) < 0) result |= Qt::XButton1; if (GetAsyncKeyState(VK_XBUTTON2) < 0) diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 1478e58ccc..a703a46cf8 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -459,7 +459,7 @@ static Qt::MouseButtons translateMouseButtons(int s) if (s & XCB_BUTTON_MASK_1) ret |= Qt::LeftButton; if (s & XCB_BUTTON_MASK_2) - ret |= Qt::MidButton; + ret |= Qt::MiddleButton; if (s & XCB_BUTTON_MASK_3) ret |= Qt::RightButton; return ret; @@ -475,7 +475,7 @@ Qt::MouseButton QXcbConnection::translateMouseButton(xcb_button_t s) { switch (s) { case 1: return Qt::LeftButton; - case 2: return Qt::MidButton; + case 2: return Qt::MiddleButton; case 3: return Qt::RightButton; // Button values 4-7 were already handled as Wheel events, and won't occur here. case 8: return Qt::BackButton; // Also known as Qt::ExtraButton1 diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 6563e95ceb..a7756919f9 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -2611,7 +2611,7 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w ret = true; break; case SH_Slider_AbsoluteSetButtons: - ret = Qt::LeftButton|Qt::MidButton; + ret = Qt::LeftButton|Qt::MiddleButton; break; case SH_Slider_PageSetButtons: ret = 0; -- cgit v1.2.3