From 974af9253cb43b2b5f9919cbe23feacaa4a5ad3d Mon Sep 17 00:00:00 2001 From: Kolcha Date: Wed, 8 Nov 2017 12:55:42 +0300 Subject: [PATCH 1/2] removed warning for wide range of GCC versions (5,6,7) --- QHotkey/qhotkey_x11.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp index ca323c2..7c26313 100644 --- a/QHotkey/qhotkey_x11.cpp +++ b/QHotkey/qhotkey_x11.cpp @@ -172,8 +172,6 @@ QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler() int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error) { -QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough") switch (error->error_code) { case BadAccess: case BadValue: @@ -184,8 +182,8 @@ QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough") errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); return 1; } + // fall through default: return 0; } -QT_WARNING_POP } From 9a04e8f539be7be7f15bbb020ca1694cef6ce5f5 Mon Sep 17 00:00:00 2001 From: Kolcha Date: Wed, 8 Nov 2017 14:16:07 +0300 Subject: [PATCH 2/2] added Q_FALLTHROUGH macro --- QHotkey/qhotkey_x11.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp index 7c26313..73e0c3b 100644 --- a/QHotkey/qhotkey_x11.cpp +++ b/QHotkey/qhotkey_x11.cpp @@ -182,6 +182,7 @@ int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorE errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); return 1; } + Q_FALLTHROUGH(); // fall through default: return 0;