From 132ee3146d10b6e6a860bfd7e03b5a8667f2a44b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 20 Jun 2017 01:02:22 +0300
Subject: Prevent Wshadow varnings in SDL code.

---
 src/gui/fonts/font.h                 | 3 +++
 src/gui/fonts/textchunk.h            | 3 +++
 src/gui/sdlinput.cpp                 | 3 +++
 src/gui/sdlinput.h                   | 3 +++
 src/gui/widgets/staticbrowserbox.cpp | 1 -
 src/gui/windowmanager.cpp            | 3 +++
 6 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/gui')

diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h
index 71661b494..053167158 100644
--- a/src/gui/fonts/font.h
+++ b/src/gui/fonts/font.h
@@ -69,7 +69,10 @@
 
 #include "gui/fonts/textchunklist.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
 #include <SDL_ttf.h>
+#pragma GCC diagnostic pop
 
 #include "localconsts.h"
 
diff --git a/src/gui/fonts/textchunk.h b/src/gui/fonts/textchunk.h
index 7d0a9b2e4..2fe8c7adc 100644
--- a/src/gui/fonts/textchunk.h
+++ b/src/gui/fonts/textchunk.h
@@ -28,7 +28,10 @@
 
 #include <string>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
 #include <SDL_ttf.h>
+#pragma GCC diagnostic pop
 
 #include "localconsts.h"
 
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index a6a3b831c..e74db48ca 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -84,7 +84,10 @@
 
 #include "render/graphics.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
 #include <SDL_timer.h>
+#pragma GCC diagnostic pop
 
 #include "debug.h"
 
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 573dc3fd2..4ec2ee9bb 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -82,7 +82,10 @@
 
 #include "input/keyinput.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
 #include <SDL_events.h>
+#pragma GCC diagnostic pop
 
 #ifdef USE_SDL2
 #include "sdlshared.h"
diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp
index 36685ca8c..7a64dd060 100644
--- a/src/gui/widgets/staticbrowserbox.cpp
+++ b/src/gui/widgets/staticbrowserbox.cpp
@@ -45,7 +45,6 @@
 #include "utils/browserboxtools.h"
 #include "utils/checkutils.h"
 #include "utils/stringutils.h"
-#include "utils/timer.h"
 #include "utils/translation/podict.h"
 
 #include <algorithm>
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index c683a6f77..c0336b7e3 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -65,6 +65,8 @@
 #include "utils/naclmessages.h"
 #endif  // __native_client__
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
 #ifdef ANDROID
 #ifndef USE_SDL2
 #include <SDL_screenkeyboard.h>
@@ -82,6 +84,7 @@
 #ifdef WIN32
 #include <SDL_syswm.h>
 #endif  // WIN32
+#pragma GCC diagnostic pop
 
 #include "debug.h"
 
-- 
cgit v1.2.3-60-g2f50