diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-04 03:21:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-04 03:21:57 +0300 |
| commit | 485ba81a87c50c23d1f97318e42f4937af1fda1f (patch) | |
| tree | b1b85f22e9bf2ea10e5fcddf3000506d207015fe /src/gui | |
| parent | 554210becbfc9de611699889a3fd0f53525a1b83 (diff) | |
| download | manaplus-485ba81a87c50c23d1f97318e42f4937af1fda1f.tar.gz manaplus-485ba81a87c50c23d1f97318e42f4937af1fda1f.tar.bz2 manaplus-485ba81a87c50c23d1f97318e42f4937af1fda1f.tar.xz manaplus-485ba81a87c50c23d1f97318e42f4937af1fda1f.zip | |
Remove some useless includes if using SDL2.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/palette.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 7 | ||||
| -rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index cedfb0f86..ef0d33d89 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -25,7 +25,9 @@ #include "utils/timer.h" +#ifndef USE_SDL2 #include <cmath> +#endif // USE_SDL2 #include "debug.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 9f64b56cd..9d89dfe45 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -69,13 +69,13 @@ #ifdef USE_SDL2 #include "enums/input/keyvalue.h" -#endif +#endif // USE_SDL2 #include "gui/gui.h" #include "gui/skin.h" #ifdef ANDROID #include "gui/windowmanager.h" -#endif +#endif // ANDROID #include "gui/fonts/font.h" @@ -85,7 +85,10 @@ #include "utils/copynpaste.h" #include "utils/stringutils.h" + +#ifndef USE_SDL2 #include "utils/timer.h" +#endif // USE_SDL2 #include "render/graphics.h" diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 8f3dea0cd..b3fdf4a62 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -35,7 +35,7 @@ #include "gui/windows/maileditwindow.h" #ifdef EATHENA_SUPPORT #include "gui/windows/npcdialog.h" -#endif +#endif // EATHENA_SUPPORT #include "gui/windows/shopwindow.h" #include "gui/windows/tradewindow.h" @@ -51,13 +51,15 @@ #include "net/inventoryhandler.h" #ifdef EATHENA_SUPPORT #include "net/npchandler.h" -#endif +#endif // EATHENA_SUPPORT #include "resources/item/item.h" #include "utils/gettext.h" +#ifndef USE_SDL2 #include <cmath> +#endif // USE_SDL2 #include "debug.h" |