summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/fonts/font.h3
-rw-r--r--src/gui/fonts/textchunk.h3
-rw-r--r--src/gui/sdlinput.cpp3
-rw-r--r--src/gui/sdlinput.h3
-rw-r--r--src/gui/widgets/staticbrowserbox.cpp1
-rw-r--r--src/gui/windowmanager.cpp3
6 files changed, 15 insertions, 1 deletions
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"