summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-01 16:49:00 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-01 16:49:00 +0300
commit331468dbfb8de05723c62149036cb8a51e769baf (patch)
treeac481eb2ef64dc718d134e2c8134919e49017943 /src/gui
parent69ed7e5ae640b0a2cd95d66b42b4c369fe522433 (diff)
downloadmv-331468dbfb8de05723c62149036cb8a51e769baf.tar.gz
mv-331468dbfb8de05723c62149036cb8a51e769baf.tar.bz2
mv-331468dbfb8de05723c62149036cb8a51e769baf.tar.xz
mv-331468dbfb8de05723c62149036cb8a51e769baf.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp1
-rw-r--r--src/gui/viewport.cpp15
-rw-r--r--src/gui/widgets/window.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index b14e3f32c..f4acc9268 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -27,6 +27,7 @@
#include "gamemodifiers.h"
#include "party.h"
+#include "being/flooritem.h"
#include "being/localplayer.h"
#include "being/playerinfo.h"
#include "being/playerrelation.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 630696e72..ff0e24210 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -29,16 +29,11 @@
#include "sdlshared.h"
#include "textmanager.h"
-#include "enums/resources/map/mapitemtype.h"
-
-#include "resources/map/map.h"
-#include "resources/map/mapitem.h"
-#include "resources/map/speciallayer.h"
-
+#include "being/flooritem.h"
#include "being/localplayer.h"
#include "being/playerinfo.h"
-#include "input/inputmanager.h"
+#include "enums/resources/map/mapitemtype.h"
#include "gui/gui.h"
#include "gui/popupmanager.h"
@@ -52,6 +47,12 @@
#include "gui/windows/ministatuswindow.h"
+#include "input/inputmanager.h"
+
+#include "resources/map/map.h"
+#include "resources/map/mapitem.h"
+#include "resources/map/speciallayer.h"
+
#include "debug.h"
Viewport *viewport = nullptr;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 0e6e9c026..54479512c 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -77,8 +77,6 @@
#include "gui/widgets/basiccontainer2.h"
-#include "resources/imagerect.h"
-
#include "localconsts.h"
class ContainerPlacer;