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 +++--- src/gui/viewport.cpp | 2 +- src/gui/widgets/avatarlistbox.cpp | 2 +- src/gui/windows/botcheckerwindow.h | 6 +++--- src/gui/windows/debugwindow.cpp | 2 ++ src/gui/windows/inventorywindow.h | 1 + src/gui/windows/killstats.cpp | 2 ++ src/gui/windows/minimap.cpp | 3 +++ src/gui/windows/ministatuswindow.cpp | 1 + src/gui/windows/ministatuswindow.h | 4 ++-- src/gui/windows/questswindow.cpp | 2 ++ src/gui/windows/quitdialog.cpp | 2 ++ src/gui/windows/socialwindow.cpp | 2 +- 15 files changed, 28 insertions(+), 15 deletions(-) (limited to 'src/gui') 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 diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index ec9f5bac3..35805287b 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -28,8 +28,8 @@ #include "sdlshared.h" #include "textmanager.h" +#include "resources/map/map.h" #include "resources/map/mapitem.h" -#include "resources/map/maplayer.h" #include "resources/map/maptype.h" #include "resources/map/speciallayer.h" diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 89fc382d6..2e8e27960 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -37,8 +37,8 @@ #include "resources/image.h" +#include "resources/map/map.h" #include "resources/map/mapitem.h" -#include "resources/map/maplayer.h" #include "debug.h" diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h index 0c86b13b0..d4587665f 100644 --- a/src/gui/windows/botcheckerwindow.h +++ b/src/gui/windows/botcheckerwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_BOTCHECKERWINDOW_H -#define GUI_BOTCHECKERWINDOW_H +#ifndef GUI_WINDOWS_BOTCHECKERWINDOW_H +#define GUI_WINDOWS_BOTCHECKERWINDOW_H #include "listeners/configlistener.h" @@ -91,4 +91,4 @@ class BotCheckerWindow final : public Window, extern BotCheckerWindow *botCheckerWindow; -#endif // GUI_BOTCHECKERWINDOW_H +#endif // GUI_WINDOWS_BOTCHECKERWINDOW_H diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index 438103f0a..c29abf090 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -40,6 +40,8 @@ #include "resources/imagehelper.h" +#include "resources/map/map.h" + #include "net/packetcounters.h" #include "utils/delete2.h" diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 538d9a47d..84cbcd4bb 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -29,6 +29,7 @@ #include "listeners/actionlistener.h" #include "listeners/attributelistener.h" +#include "listeners/inventorylistener.h" #include "listeners/keylistener.h" #include "listeners/selectionlistener.h" diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index e9dd50d5d..0145d551f 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -34,6 +34,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "resources/map/map.h" + #include "utils/gettext.h" #include "debug.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 81d52387b..ffaba0c2f 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -39,6 +39,9 @@ #include "resources/imagehelper.h" #include "resources/resourcemanager.h" +#include "resources/map/map.h" +#include "resources/map/metatile.h" + #include "utils/delete2.h" #include "utils/gettext.h" #include "utils/sdlcheckutils.h" diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 1a8f463e5..d54954e78 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -24,6 +24,7 @@ #include "animatedsprite.h" #include "configuration.h" +#include "inventory.h" #include "being/attributes.h" #include "being/localplayer.h" diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 7c16bb132..add4ea6b6 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -23,10 +23,9 @@ #ifndef GUI_WINDOWS_MINISTATUSWINDOW_H #define GUI_WINDOWS_MINISTATUSWINDOW_H -#include "inventory.h" - #include "listeners/arrowslistener.h" #include "listeners/attributelistener.h" +#include "listeners/inventorylistener.h" #include "listeners/statlistener.h" #include "listeners/updatestatuslistener.h" @@ -36,6 +35,7 @@ class AnimatedSprite; class Graphics; +class Inventory; class ProgressBar; class StatusPopup; class TextPopup; diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index b57ed9bd7..fdaccc2d9 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -46,6 +46,8 @@ #include "resources/beingcommon.h" +#include "resources/map/map.h" + #include "debug.h" enum QuestType diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index a1add2711..bc93bb2ae 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -42,6 +42,8 @@ #include "net/gamehandler.h" #include "net/net.h" +#include "resources/map/map.h" + #include "utils/gettext.h" #include "utils/process.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 1cfc313b5..dbba86562 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -27,8 +27,8 @@ #include "guildmanager.h" #include "party.h" +#include "resources/map/map.h" #include "resources/map/mapitem.h" -#include "resources/map/maplayer.h" #include "resources/map/speciallayer.h" #include "being/localplayer.h" -- cgit v1.2.3-70-g09d2