From 11a49b50fb6c2ff20f62f39d8606f54770b6a295 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 12 May 2014 02:29:07 +0300 Subject: Fix code style --- src/gui/popups/popupmenu.cpp | 2 +- src/gui/popups/statuspopup.h | 6 +++--- src/gui/popups/textpopup.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/popups') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 02feef997..f997c0549 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -76,8 +76,8 @@ #include "resources/iteminfo.h" +#include "resources/map/map.h" #include "resources/map/mapitem.h" -#include "resources/map/maplayer.h" #include "resources/map/speciallayer.h" #include "utils/copynpaste.h" diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h index 8904b6acc..6b9b917b7 100644 --- a/src/gui/popups/statuspopup.h +++ b/src/gui/popups/statuspopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see . */ -#ifndef GUI_STATUSPOPUP_H -#define GUI_STATUSPOPUP_H +#ifndef GUI_POPUPS_STATUSPOPUP_H +#define GUI_POPUPS_STATUSPOPUP_H #include "input/keydata.h" @@ -68,4 +68,4 @@ class StatusPopup final : public Popup Label *mLabels[STATUSPOPUP_NUM_LABELS]; }; -#endif // GUI_STATUSPOPUP_H +#endif // GUI_POPUPS_STATUSPOPUP_H diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h index e1dcb95b8..c36b94838 100644 --- a/src/gui/popups/textpopup.h +++ b/src/gui/popups/textpopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see . */ -#ifndef GUI_TEXTPOPUP_H -#define GUI_TEXTPOPUP_H +#ifndef GUI_POPUPS_TEXTPOPUP_H +#define GUI_POPUPS_TEXTPOPUP_H #include "gui/widgets/popup.h" @@ -78,4 +78,4 @@ class TextPopup final : public Popup Label *mText[TEXTPOPUPCOUNT]; }; -#endif // GUI_TEXTPOPUP_H +#endif // GUI_POPUPS_TEXTPOPUP_H -- cgit v1.2.3-60-g2f50