Merge pull request #10 from Kolcha/master

Skycoder42 · web-flow · commit f4665e20ade4 · 2017-11-08T12:28:41.000+01:00
removed warning for wide range of GCC versions (5,6,7), fixes #9
diff --git 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,9 @@ QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough")
 			errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code);
 			return 1;
 		}
+		Q_FALLTHROUGH();
+		// fall through
 	default:
 		return 0;
 	}
-QT_WARNING_POP
 }

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,6 @@ QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler()`
`172`	`172`
`173`	`173`	`int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display display, XErrorEvent error)`
`174`	`174`	`{`
`175`		`-QT_WARNING_PUSH`
`176`		`-QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough")`
`177`	`175`	`switch (error->error_code) {`
`178`	`176`	`case BadAccess:`
`179`	`177`	`case BadValue:`
`@@ -184,8 +182,9 @@ QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough")`
`184`	`182`	`errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code);`
`185`	`183`	`return 1;`
`186`	`184`	`}`
	`185`	`+ Q_FALLTHROUGH();`
	`186`	`+ // fall through`
`187`	`187`	`default:`
`188`	`188`	`return 0;`
`189`	`189`	`}`
`190`		`-QT_WARNING_POP`
`191`	`190`	`}`