From cad3b1d8688b94b185ada0f0b313435ac4b3b457 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 4 Oct 2013 00:32:54 +0300 Subject: fix code style. --- src/actorspritemanager.cpp | 1 - src/actorspritemanager.h | 3 ++- src/animatedsprite.h | 10 +++++----- src/animatedsprite_unittest.cc | 6 ++++-- src/being/being.cpp | 3 ++- src/being/being.h | 3 ++- src/being/localplayer.cpp | 4 ++-- src/gui/popups/beingpopup.cpp | 1 - src/gui/popups/beingpopup.h | 6 +++--- src/gui/popups/itempopup.cpp | 1 - src/gui/popups/itempopup.h | 6 +++--- src/gui/popups/popupmenu.h | 6 +++--- src/gui/popups/speechbubble.cpp | 1 - src/gui/popups/speechbubble.h | 6 +++--- src/gui/popups/spellpopup.cpp | 1 - src/gui/popups/spellpopup.h | 6 +++--- src/gui/widgets/setupitem.cpp | 1 - src/gui/widgets/tabs/battletab.h | 6 +++--- src/gui/widgets/tabs/chattab.h | 6 +++--- src/gui/widgets/tabs/gmtab.h | 6 +++--- src/gui/widgets/tabs/guildchattab.h | 6 +++--- src/gui/widgets/tabs/langtab.h | 6 +++--- src/gui/widgets/tabs/setup_audio.h | 6 +++--- src/gui/widgets/tabs/setup_chat.h | 6 +++--- src/gui/widgets/tabs/setup_colors.cpp | 1 - src/gui/widgets/tabs/setup_colors.h | 6 +++--- src/gui/widgets/tabs/setup_input.h | 6 +++--- src/gui/widgets/tabs/setup_joystick.h | 6 +++--- src/gui/widgets/tabs/setup_other.h | 6 +++--- src/gui/widgets/tabs/setup_perfomance.h | 6 +++--- src/gui/widgets/tabs/setup_players.h | 6 +++--- src/gui/widgets/tabs/setup_relations.h | 6 +++--- src/gui/widgets/tabs/setup_theme.cpp | 2 -- src/gui/widgets/tabs/setup_theme.h | 6 +++--- src/gui/widgets/tabs/setup_touch.h | 6 +++--- src/gui/widgets/tabs/setup_video.h | 6 +++--- src/gui/widgets/tabs/setup_visual.h | 6 +++--- src/gui/widgets/tabs/setuptab.h | 6 +++--- src/gui/widgets/tabs/setuptabscroll.h | 6 +++--- src/gui/widgets/tabs/tab.h | 6 +++--- src/gui/widgets/tabs/tradetab.h | 6 +++--- src/gui/widgets/tabs/whispertab.h | 6 +++--- src/gui/windows/buydialog.h | 6 +++--- src/gui/windows/buyselldialog.h | 6 +++--- src/gui/windows/changeemaildialog.h | 6 +++--- src/gui/windows/changepassworddialog.h | 6 +++--- src/gui/windows/charcreatedialog.cpp | 1 - src/gui/windows/charcreatedialog.h | 6 +++--- src/gui/windows/charselectdialog.h | 6 +++--- src/gui/windows/chatwindow.cpp | 1 - src/gui/windows/chatwindow.h | 8 +++----- src/gui/windows/confirmdialog.h | 6 +++--- src/gui/windows/connectiondialog.h | 6 +++--- src/gui/windows/debugwindow.h | 6 +++--- src/gui/windows/didyouknowwindow.cpp | 1 - src/gui/windows/didyouknowwindow.h | 6 +++--- src/gui/windows/editdialog.h | 6 +++--- src/gui/windows/editserverdialog.h | 6 +++--- src/gui/windows/emotewindow.h | 6 +++--- src/gui/windows/equipmentwindow.h | 6 +++--- src/gui/windows/helpwindow.cpp | 1 - src/gui/windows/helpwindow.h | 6 +++--- src/gui/windows/inventorywindow.cpp | 3 --- src/gui/windows/inventorywindow.h | 6 +++--- src/gui/windows/itemamountwindow.h | 6 +++--- src/gui/windows/killstats.h | 6 +++--- src/gui/windows/logindialog.h | 6 +++--- src/gui/windows/minimap.h | 6 +++--- src/gui/windows/ministatuswindow.h | 6 +++--- src/gui/windows/npcdialog.h | 6 +++--- src/gui/windows/npcpostdialog.h | 6 +++--- src/gui/windows/okdialog.h | 6 +++--- src/gui/windows/outfitwindow.h | 6 +++--- src/gui/windows/questswindow.cpp | 1 - src/gui/windows/questswindow.h | 6 +++--- src/gui/windows/quitdialog.h | 6 +++--- src/gui/windows/registerdialog.h | 6 +++--- src/gui/windows/selldialog.h | 6 +++--- src/gui/windows/serverdialog.cpp | 1 - src/gui/windows/serverdialog.h | 6 +++--- src/gui/windows/setup.h | 6 +++--- src/gui/windows/shopwindow.h | 6 +++--- src/gui/windows/shortcutwindow.h | 6 +++--- src/gui/windows/skilldialog.h | 6 +++--- src/gui/windows/socialwindow.h | 6 +++--- src/gui/windows/statuswindow.h | 6 +++--- src/gui/windows/textcommandeditor.h | 6 +++--- src/gui/windows/textdialog.h | 6 +++--- src/gui/windows/tradewindow.cpp | 1 - src/gui/windows/tradewindow.h | 6 +++--- src/gui/windows/unregisterdialog.h | 6 +++--- src/gui/windows/updaterwindow.h | 6 +++--- src/gui/windows/whoisonline.h | 6 +++--- src/gui/windows/worldselectdialog.h | 6 +++--- src/map.h | 3 ++- src/render/mgl.h | 6 +++--- src/resources/db/avatardb.h | 6 +++--- src/resources/db/chardb.h | 6 +++--- src/resources/db/colordb.h | 6 +++--- src/resources/db/deaddb.h | 6 +++--- src/resources/db/emotedb.h | 6 +++--- src/resources/db/itemdb.h | 6 +++--- src/resources/db/mapdb.h | 6 +++--- src/resources/db/monsterdb.h | 6 +++--- src/resources/db/npcdb.h | 6 +++--- src/resources/db/palettedb.h | 6 +++--- src/resources/db/petdb.h | 6 +++--- src/resources/db/sounddb.h | 6 +++--- src/touchmanager.cpp | 6 ++++-- 109 files changed, 278 insertions(+), 291 deletions(-) diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 7a8dd13e4..3e3a84d38 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -34,7 +34,6 @@ #include "gui/widgets/tabs/chattab.h" -#include "gui/windows/chatwindow.h" #include "gui/windows/equipmentwindow.h" #include "gui/windows/socialwindow.h" diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index a32ee3e4d..ef0cf6875 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -281,7 +281,8 @@ class ActorSpriteManager final: public ConfigListener defList(Pickup, Items) defList(IgnorePickup, Items) - const std::map &getAttackMobsMap() const A_WARN_UNUSED + const std::map &getAttackMobsMap() + const A_WARN_UNUSED { return mAttackMobsMap; } const std::map &getPriorityAttackMobsMap() diff --git a/src/animatedsprite.h b/src/animatedsprite.h index df287a560..83722ebf8 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -110,16 +110,16 @@ class AnimatedSprite final : public Sprite SpriteDef *getSprite() { return mSprite; } - Frame *getFrame() + const Frame *getFrame() const { return mFrame; } - Animation *getAnimation() + const Animation *getAnimation() const { return mAnimation; } - unsigned int getFrameIndex() + unsigned int getFrameIndex() const { return mFrameIndex; } - unsigned int getFrameTime() + unsigned int getFrameTime() const { return mFrameTime; } #endif @@ -135,7 +135,7 @@ class AnimatedSprite final : public Sprite unsigned int mFrameTime; /**< The time since start of frame. */ SpriteDef *mSprite; /**< The sprite definition. */ - const Action *mAction; /**< The currently active action. */ + const Action *mAction; /**< The currently active action. */ const Animation *mAnimation; /**< The currently active animation. */ const Frame *mFrame; /**< The currently active frame. */ unsigned mNumber; diff --git a/src/animatedsprite_unittest.cc b/src/animatedsprite_unittest.cc index e3e470ac6..9fc927efd 100644 --- a/src/animatedsprite_unittest.cc +++ b/src/animatedsprite_unittest.cc @@ -84,7 +84,8 @@ TEST(AnimatedSprite, basic2) "graphics/sprites/test.xml", 0); sprite->play(SpriteAction::STAND); - EXPECT_EQ(10, sprite->getAnimation()->getFrames().size()); + EXPECT_EQ(10, const_cast(sprite->getAnimation()) + ->getFrames().size()); EXPECT_NE(nullptr, sprite); @@ -141,7 +142,8 @@ TEST(AnimatedSprite, basic2) sprite2->play(SpriteAction::SIT); EXPECT_EQ(false, sprite2->update(1)); - EXPECT_EQ(2, sprite2->getAnimation()->getFrames().size()); + EXPECT_EQ(2, const_cast(sprite2->getAnimation()) + ->getFrames().size()); EXPECT_EQ(0, sprite2->getFrameTime()); EXPECT_EQ(85, sprite2->getFrame()->delay); diff --git a/src/being/being.cpp b/src/being/being.cpp index 01ab7b267..43f82db0b 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2272,7 +2272,8 @@ bool Being::drawSpriteAt(Graphics *const graphics, graphics->setColor(userPalette-> getColorWithAlpha(UserPalette::PORTAL_HIGHLIGHT)); - graphics->fillRectangle(gcn::Rectangle(x, y, mapTileSize, mapTileSize)); + graphics->fillRectangle(gcn::Rectangle(x, y, + mapTileSize, mapTileSize)); if (mDrawHotKeys && !mName.empty()) { diff --git a/src/being/being.h b/src/being/being.h index 04e32ae61..314787a56 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -322,7 +322,8 @@ class Being : public ActorSprite, public ConfigListener /** * Returns a pointer to the specified guild that the being is in. */ - const Guild *getGuild(const std::string &guildName) const A_WARN_UNUSED; + const Guild *getGuild(const std::string &guildName) + const A_WARN_UNUSED; /** * Returns a pointer to the specified guild that the being is in. diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index de2f3f30c..ffd2593f0 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -506,8 +506,8 @@ Position LocalPlayer::getNextWalkPosition(const unsigned char dir) const } else // The diagonal is walkable { - return mMap->checkNodeOffsets(radius, - walkMask, Position(posX + mapTileSize, posY - mapTileSize)); + return mMap->checkNodeOffsets(radius, walkMask, + Position(posX + mapTileSize, posY - mapTileSize)); } } diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index ae16d8eb2..c455640d6 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -24,7 +24,6 @@ #include "being/being.h" #include "being/playerrelations.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/widgets/label.h" diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h index 3ac46d30c..12ba49aa0 100644 --- a/src/gui/popups/beingpopup.h +++ b/src/gui/popups/beingpopup.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef GUI_BEINGPOPUP_H -#define GUI_BEINGPOPUP_H +#ifndef GUI_POPUPS_BEINGPOPUP_H +#define GUI_POPUPS_BEINGPOPUP_H #include "gui/widgets/popup.h" @@ -62,4 +62,4 @@ class BeingPopup final : public Popup Label *mBeingComment; }; -#endif // GUI_BEINGPOPUP_H +#endif // GUI_POPUPS_BEINGPOPUP_H diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 63fe3628c..c05073750 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -28,7 +28,6 @@ #include "item.h" #include "units.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/widgets/icon.h" diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index d0b313e26..5c06cbf5a 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see . */ -#ifndef GUI_ITEMPOPUP_H -#define GUI_ITEMPOPUP_H +#ifndef GUI_POPUPS_ITEMPOPUP_H +#define GUI_POPUPS_ITEMPOPUP_H #include "gui/widgets/popup.h" @@ -73,4 +73,4 @@ class ItemPopup final : public Popup void setLabelColor(Label *label, const ItemType type) const; }; -#endif // GUI_ITEMPOPUP_H +#endif // GUI_POPUPS_ITEMPOPUP_H diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index 3865c2bd3..f5ff7fb84 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_POPUPMENU_H -#define GUI_POPUPMENU_H +#ifndef GUI_POPUPS_POPUPMENU_H +#define GUI_POPUPS_POPUPMENU_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" @@ -238,4 +238,4 @@ class PopupMenu final : public Popup, public LinkHandler void showPopup(int x, int y); }; -#endif // GUI_POPUPMENU_H +#endif // GUI_POPUPS_POPUPMENU_H diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp index 510bb9eae..989ebb551 100644 --- a/src/gui/popups/speechbubble.cpp +++ b/src/gui/popups/speechbubble.cpp @@ -23,7 +23,6 @@ #include "gui/popups/speechbubble.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/widgets/label.h" diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h index ca3c9668b..3753ee82d 100644 --- a/src/gui/popups/speechbubble.h +++ b/src/gui/popups/speechbubble.h @@ -21,8 +21,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SPEECHBUBBLE_H -#define GUI_SPEECHBUBBLE_H +#ifndef GUI_POPUPS_SPEECHBUBBLE_H +#define GUI_POPUPS_SPEECHBUBBLE_H #include "gui/theme.h" @@ -61,4 +61,4 @@ class SpeechBubble final : public Popup TextBox *mSpeechBox; }; -#endif // GUI_SPEECHBUBBLE_H +#endif // GUI_POPUPS_SPEECHBUBBLE_H diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp index 4e06b3d87..5db8ceafb 100644 --- a/src/gui/popups/spellpopup.cpp +++ b/src/gui/popups/spellpopup.cpp @@ -23,7 +23,6 @@ #include "gui/popups/spellpopup.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/widgets/label.h" diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h index b7a1f83b3..abd542461 100644 --- a/src/gui/popups/spellpopup.h +++ b/src/gui/popups/spellpopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SPELLPOPUP_H -#define GUI_SPELLPOPUP_H +#ifndef GUI_POPUPS_SPELLPOPUP_H +#define GUI_POPUPS_SPELLPOPUP_H #include "gui/widgets/popup.h" @@ -66,4 +66,4 @@ class SpellPopup final : public Popup Label *mItemComment; }; -#endif // GUI_SPELLPOPUP_H +#endif // GUI_POPUPS_SPELLPOPUP_H diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 0cbfd1a5e..6d1c38d48 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -24,7 +24,6 @@ #include "main.h" #include "soundmanager.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/windows/editdialog.h" diff --git a/src/gui/widgets/tabs/battletab.h b/src/gui/widgets/tabs/battletab.h index b4aa1d1df..1624094aa 100644 --- a/src/gui/widgets/tabs/battletab.h +++ b/src/gui/widgets/tabs/battletab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_BATTLETAB_H -#define GUI_WIDGETS_BATTLETAB_H +#ifndef GUI_WIDGETS_TABS_BATTLETAB_H +#define GUI_WIDGETS_TABS_BATTLETAB_H #include "gui/widgets/tabs/chattab.h" @@ -45,4 +45,4 @@ class BattleTab final : public ChatTab extern BattleTab *battleChatTab; -#endif // GUI_WIDGETS_BATTLETAB_H +#endif // GUI_WIDGETS_TABS_BATTLETAB_H diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h index e7744a8c1..91dee8148 100644 --- a/src/gui/widgets/tabs/chattab.h +++ b/src/gui/widgets/tabs/chattab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_CHATTAB_H -#define GUI_WIDGETS_CHATTAB_H +#ifndef GUI_WIDGETS_TABS_CHATTAB_H +#define GUI_WIDGETS_TABS_CHATTAB_H #include "gui/windows/chatwindow.h" @@ -209,4 +209,4 @@ class ChatTab : public Tab extern ChatTab *localChatTab; extern ChatTab *debugChatTab; -#endif // GUI_WIDGETS_CHATTAB_H +#endif // GUI_WIDGETS_TABS_CHATTAB_H diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h index 28ccabe8a..85f6cad89 100644 --- a/src/gui/widgets/tabs/gmtab.h +++ b/src/gui/widgets/tabs/gmtab.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_GMTAB_H -#define GUI_WIDGETS_GMTAB_H +#ifndef GUI_WIDGETS_TABS_GMTAB_H +#define GUI_WIDGETS_TABS_GMTAB_H #include "gui/widgets/tabs/chattab.h" @@ -50,4 +50,4 @@ class GmTab final : public ChatTab extern GmTab *gmChatTab; -#endif // GUI_WIDGETS_GMTAB_H +#endif // GUI_WIDGETS_TABS_GMTAB_H diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h index f7aebcf55..9739f5958 100644 --- a/src/gui/widgets/tabs/guildchattab.h +++ b/src/gui/widgets/tabs/guildchattab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_GUILDCHATTAB_H -#define GUI_WIDGETS_GUILDCHATTAB_H +#ifndef GUI_WIDGETS_TABS_GUILDCHATTAB_H +#define GUI_WIDGETS_TABS_GUILDCHATTAB_H #include "gui/widgets/tabs/chattab.h" @@ -57,4 +57,4 @@ class GuildChatTab final : public ChatTab, public ConfigListener void getAutoCompleteList(StringVect &names) const override; }; -#endif // GUI_WIDGETS_GUILDCHATTAB_H +#endif // GUI_WIDGETS_TABS_GUILDCHATTAB_H diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h index fa4e7c08c..8f2d0dfed 100644 --- a/src/gui/widgets/tabs/langtab.h +++ b/src/gui/widgets/tabs/langtab.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_LANGTAB_H -#define GUI_WIDGETS_LANGTAB_H +#ifndef GUI_WIDGETS_TABS_LANGTAB_H +#define GUI_WIDGETS_TABS_LANGTAB_H #include "gui/widgets/tabs/chattab.h" @@ -40,4 +40,4 @@ class LangTab final : public ChatTab extern LangTab *langChatTab; -#endif // GUI_WIDGETS_LANGTAB_H +#endif // GUI_WIDGETS_TABS_LANGTAB_H diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h index 98cdc5470..1054f250b 100644 --- a/src/gui/widgets/tabs/setup_audio.h +++ b/src/gui/widgets/tabs/setup_audio.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_AUDIO_H -#define GUI_SETUP_AUDIO_H +#ifndef GUI_WIDGETS_TABS_SETUP_AUDIO_H +#define GUI_WIDGETS_TABS_SETUP_AUDIO_H #include "gui/widgets/setupitem.h" @@ -42,4 +42,4 @@ class Setup_Audio final : public SetupTabScroll SetupItemNames *mChannelsList; }; -#endif // GUI_SETUP_AUDIO_H +#endif // GUI_WIDGETS_TABS_SETUP_AUDIO_H diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h index 108f67a7f..aa151e6f0 100644 --- a/src/gui/widgets/tabs/setup_chat.h +++ b/src/gui/widgets/tabs/setup_chat.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_CHAT_H -#define GUI_SETUP_CHAT_H +#ifndef GUI_WIDGETS_TABS_SETUP_CHAT_H +#define GUI_WIDGETS_TABS_SETUP_CHAT_H #include "gui/widgets/tabs/setuptabscroll.h" @@ -37,4 +37,4 @@ class Setup_Chat final : public SetupTabScroll void externalUpdated() override; }; -#endif // GUI_SETUP_CHAT_H +#endif // GUI_WIDGETS_TABS_SETUP_CHAT_H diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index f5b834b6a..19139e37f 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -21,7 +21,6 @@ #include "gui/widgets/tabs/setup_colors.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/userpalette.h" diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h index fcc6a378f..347c43cab 100644 --- a/src/gui/widgets/tabs/setup_colors.h +++ b/src/gui/widgets/tabs/setup_colors.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_COLORS_H -#define GUI_SETUP_COLORS_H +#ifndef GUI_WIDGETS_TABS_SETUP_COLORS_H +#define GUI_WIDGETS_TABS_SETUP_COLORS_H #include "gui/widgets/tabs/setuptab.h" @@ -90,4 +90,4 @@ class Setup_Colors final : public SetupTab, void updateGradType(); }; -#endif // GUI_SETUP_COLORS_H +#endif // GUI_WIDGETS_TABS_SETUP_COLORS_H diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h index 03113913e..72ea08f31 100644 --- a/src/gui/widgets/tabs/setup_input.h +++ b/src/gui/widgets/tabs/setup_input.h @@ -21,8 +21,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_INPUT_H -#define GUI_SETUP_INPUT_H +#ifndef GUI_WIDGETS_TABS_SETUP_INPUT_H +#define GUI_WIDGETS_TABS_SETUP_INPUT_H #include "gui/widgets/tabs/setuptab.h" @@ -101,4 +101,4 @@ class Setup_Input final : public SetupTab int *mActionDataSize; }; -#endif // GUI_SETUP_INPUT_H +#endif // GUI_WIDGETS_TABS_SETUP_INPUT_H diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h index 3110da9b6..4254dac81 100644 --- a/src/gui/widgets/tabs/setup_joystick.h +++ b/src/gui/widgets/tabs/setup_joystick.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_JOYSTICK_H -#define GUI_SETUP_JOYSTICK_H +#ifndef GUI_WIDGETS_TABS_SETUP_JOYSTICK_H +#define GUI_WIDGETS_TABS_SETUP_JOYSTICK_H #include "gui/widgets/tabs/setuptab.h" @@ -59,4 +59,4 @@ class Setup_Joystick final : public SetupTab CheckBox *mUseInactiveCheckBox; }; -#endif // GUI_SETUP_JOYSTICK_H +#endif // GUI_WIDGETS_TABS_SETUP_JOYSTICK_H diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h index 10e83517b..e914dca37 100644 --- a/src/gui/widgets/tabs/setup_other.h +++ b/src/gui/widgets/tabs/setup_other.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_OTHER_H -#define GUI_SETUP_OTHER_H +#ifndef GUI_WIDGETS_TABS_SETUP_OTHER_H +#define GUI_WIDGETS_TABS_SETUP_OTHER_H #include "gui/widgets/tabs/setuptabscroll.h" @@ -46,4 +46,4 @@ class Setup_Other final : public SetupTabScroll NamesModel *mDensityList; }; -#endif // GUI_SETUP_OTHER_H +#endif // GUI_WIDGETS_TABS_SETUP_OTHER_H diff --git a/src/gui/widgets/tabs/setup_perfomance.h b/src/gui/widgets/tabs/setup_perfomance.h index 1695dec1f..cc226daa4 100644 --- a/src/gui/widgets/tabs/setup_perfomance.h +++ b/src/gui/widgets/tabs/setup_perfomance.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_PERFOMANCE_H -#define GUI_SETUP_PERFOMANCE_H +#ifndef GUI_WIDGETS_TABS_SETUP_PERFOMANCE_H +#define GUI_WIDGETS_TABS_SETUP_PERFOMANCE_H #include "gui/widgets/tabs/setuptabscroll.h" @@ -40,4 +40,4 @@ class Setup_Perfomance final : public SetupTabScroll NamesModel *mTexturesList; }; -#endif // GUI_SETUP_PERFOMANCE_H +#endif // GUI_WIDGETS_TABS_SETUP_PERFOMANCE_H diff --git a/src/gui/widgets/tabs/setup_players.h b/src/gui/widgets/tabs/setup_players.h index af0709c08..c942c1a03 100644 --- a/src/gui/widgets/tabs/setup_players.h +++ b/src/gui/widgets/tabs/setup_players.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_PLAYERS_H -#define GUI_SETUP_PLAYERS_H +#ifndef GUI_WIDGETS_TABS_SETUP_PLAYERS_H +#define GUI_WIDGETS_TABS_SETUP_PLAYERS_H #include "gui/widgets/tabs/setuptabscroll.h" @@ -33,4 +33,4 @@ class Setup_Players final : public SetupTabScroll A_DELETE_COPY(Setup_Players) }; -#endif // GUI_SETUP_PLAYERS_H +#endif // GUI_WIDGETS_TABS_SETUP_PLAYERS_H diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h index 789dd5f3e..b5c99934a 100644 --- a/src/gui/widgets/tabs/setup_relations.h +++ b/src/gui/widgets/tabs/setup_relations.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_RELATIONS_H -#define GUI_SETUP_RELATIONS_H +#ifndef GUI_WIDGETS_TABS_SETUP_RELATIONS_H +#define GUI_WIDGETS_TABS_SETUP_RELATIONS_H #include "being/playerrelations.h" @@ -80,4 +80,4 @@ private: DropDown *mIgnoreActionChoicesBox; }; -#endif // GUI_SETUP_RELATIONS_H +#endif // GUI_WIDGETS_TABS_SETUP_RELATIONS_H diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index dde3ad04e..109666bb1 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/tabs/setup_theme.h" -#include "gui/gui.h" - #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h index 96d07aa15..e6cf63d17 100644 --- a/src/gui/widgets/tabs/setup_theme.h +++ b/src/gui/widgets/tabs/setup_theme.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_THEME_H -#define GUI_SETUP_THEME_H +#ifndef GUI_WIDGETS_TABS_SETUP_THEME_H +#define GUI_WIDGETS_TABS_SETUP_THEME_H #include "gui/widgets/tabs/setuptab.h" @@ -102,4 +102,4 @@ class Setup_Theme final : public SetupTab std::string mThemeInfo; }; -#endif // GUI_SETUP_THEME_H +#endif // GUI_WIDGETS_TABS_SETUP_THEME_H diff --git a/src/gui/widgets/tabs/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h index b908ce19d..dee9905b6 100644 --- a/src/gui/widgets/tabs/setup_touch.h +++ b/src/gui/widgets/tabs/setup_touch.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_TOUCH_H -#define GUI_SETUP_TOUCH_H +#ifndef GUI_WIDGETS_TABS_SETUP_TOUCH_H +#define GUI_WIDGETS_TABS_SETUP_TOUCH_H #include "gui/widgets/setuptouchitem.h" @@ -38,4 +38,4 @@ class Setup_Touch final : public SetupTabScroll TouchActionsModel *mActionsList; }; -#endif // GUI_SETUP_TOUCH_H +#endif // GUI_WIDGETS_TABS_SETUP_TOUCH_H diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h index e8fb415c9..f98b1478b 100644 --- a/src/gui/widgets/tabs/setup_video.h +++ b/src/gui/widgets/tabs/setup_video.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_VIDEO_H -#define GUI_SETUP_VIDEO_H +#ifndef GUI_WIDGETS_TABS_SETUP_VIDEO_H +#define GUI_WIDGETS_TABS_SETUP_VIDEO_H #include "gui/widgets/tabs/setuptab.h" @@ -79,4 +79,4 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener CheckBox *mNoFrameCheckBox; }; -#endif // GUI_SETUP_VIDEO_H +#endif // GUI_WIDGETS_TABS_SETUP_VIDEO_H diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h index e1492d028..92c8147ef 100644 --- a/src/gui/widgets/tabs/setup_visual.h +++ b/src/gui/widgets/tabs/setup_visual.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_VISUAL_H -#define GUI_SETUP_VISUAL_H +#ifndef GUI_WIDGETS_TABS_SETUP_VISUAL_H +#define GUI_WIDGETS_TABS_SETUP_VISUAL_H #include "gui/widgets/setupitem.h" @@ -45,4 +45,4 @@ class Setup_Visual final : public SetupTabScroll NamesModel *mVSyncList; }; -#endif // GUI_SETUP_VISUAL_H +#endif // GUI_WIDGETS_TABS_SETUP_VISUAL_H diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h index ab866ba28..d42b27a9f 100644 --- a/src/gui/widgets/tabs/setuptab.h +++ b/src/gui/widgets/tabs/setuptab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_SETUPTAB_H -#define GUI_WIDGETS_SETUPTAB_H +#ifndef GUI_WIDGETS_TABS_SETUPTAB_H +#define GUI_WIDGETS_TABS_SETUPTAB_H #include "gui/widgets/container.h" @@ -71,4 +71,4 @@ class SetupTab : public Container, std::string mName; }; -#endif // GUI_WIDGETS_SETUPTAB_H +#endif // GUI_WIDGETS_TABS_SETUPTAB_H diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index e7be18709..16ded3ab3 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_SETUPTABSCROLL_H -#define GUI_WIDGETS_SETUPTABSCROLL_H +#ifndef GUI_WIDGETS_TABS_SETUPTABSCROLL_H +#define GUI_WIDGETS_TABS_SETUPTABSCROLL_H #include "gui/widgets/tabs/setuptab.h" @@ -72,4 +72,4 @@ class SetupTabScroll : public SetupTab int mPreferredFirstItemSize; }; -#endif // GUI_WIDGETS_SETUPTABSCROLL_H +#endif // GUI_WIDGETS_TABS_SETUPTABSCROLL_H diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index ecd0ae494..6106ccb29 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_TAB_H -#define GUI_WIDGETS_TAB_H +#ifndef GUI_WIDGETS_TABS_TAB_H +#define GUI_WIDGETS_TABS_TAB_H #include "gui/widgets/widget2.h" @@ -184,4 +184,4 @@ class Tab : public gcn::BasicContainer, bool mHasMouse; }; -#endif // GUI_WIDGETS_TAB_H +#endif // GUI_WIDGETS_TABS_TAB_H diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h index 8c28704a4..d868c5a26 100644 --- a/src/gui/widgets/tabs/tradetab.h +++ b/src/gui/widgets/tabs/tradetab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_TRADETAB_H -#define GUI_WIDGETS_TRADETAB_H +#ifndef GUI_WIDGETS_TABS_TRADETAB_H +#define GUI_WIDGETS_TABS_TRADETAB_H #include "gui/widgets/tabs/chattab.h" @@ -48,4 +48,4 @@ class TradeTab final : public ChatTab extern TradeTab *tradeChatTab; -#endif // GUI_WIDGETS_TRADETAB_H +#endif // GUI_WIDGETS_TABS_TRADETAB_H diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h index 97e6427c2..d6d8b2a47 100644 --- a/src/gui/widgets/tabs/whispertab.h +++ b/src/gui/widgets/tabs/whispertab.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WIDGETS_WHISPERTAB_H -#define GUI_WIDGETS_WHISPERTAB_H +#ifndef GUI_WIDGETS_TABS_WHISPERTAB_H +#define GUI_WIDGETS_TABS_WHISPERTAB_H #include "gui/widgets/tabs/chattab.h" @@ -71,4 +71,4 @@ class WhisperTab final : public ChatTab std::string mNick; }; -#endif // GUI_WIDGETS_WHISPERTAB_H +#endif // GUI_WIDGETS_TABS_WHISPERTAB_H diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index 875184851..5f19dd5ab 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_BUYDIALOG_H -#define GUI_BUYDIALOG_H +#ifndef GUI_WINDOWS_BUYDIALOG_H +#define GUI_WINDOWS_BUYDIALOG_H #include "gui/widgets/window.h" @@ -160,4 +160,4 @@ class BuyDialog final : public Window, DropDown *mSortDropDown; }; -#endif // GUI_BUYDIALOG_H +#endif // GUI_WINDOWS_BUYDIALOG_H diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h index 193364ff8..e8fe80a06 100644 --- a/src/gui/windows/buyselldialog.h +++ b/src/gui/windows/buyselldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_BUYSELLDIALOG_H -#define GUI_BUYSELLDIALOG_H +#ifndef GUI_WINDOWS_BUYSELLDIALOG_H +#define GUI_WINDOWS_BUYSELLDIALOG_H #include "gui/widgets/window.h" @@ -80,4 +80,4 @@ class BuySellDialog final : public Window, public gcn::ActionListener Button *mBuyButton; }; -#endif // GUI_BUYSELLDIALOG_H +#endif // GUI_WINDOWS_BUYSELLDIALOG_H diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index e61ac8bc5..41c611fb8 100644 --- a/src/gui/windows/changeemaildialog.h +++ b/src/gui/windows/changeemaildialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_CHANGEEMAILDIALOG_H -#define GUI_CHANGEEMAILDIALOG_H +#ifndef GUI_WINDOWS_CHANGEEMAILDIALOG_H +#define GUI_WINDOWS_CHANGEEMAILDIALOG_H #include "gui/widgets/window.h" @@ -77,4 +77,4 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener LoginData *mLoginData; }; -#endif // GUI_CHANGEEMAILDIALOG_H +#endif // GUI_WINDOWS_CHANGEEMAILDIALOG_H diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h index fd70348a6..144f73cd7 100644 --- a/src/gui/windows/changepassworddialog.h +++ b/src/gui/windows/changepassworddialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_CHANGEPASSWORDDIALOG_H -#define GUI_CHANGEPASSWORDDIALOG_H +#ifndef GUI_WINDOWS_CHANGEPASSWORDDIALOG_H +#define GUI_WINDOWS_CHANGEPASSWORDDIALOG_H #include "gui/widgets/window.h" @@ -72,4 +72,4 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener LoginData *mLoginData; }; -#endif // GUI_CHANGEPASSWORDDIALOG_H +#endif // GUI_WINDOWS_CHANGEPASSWORDDIALOG_H diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 3916a1ece..7c09b0dfb 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -41,7 +41,6 @@ #include "resources/iteminfo.h" #include "resources/db/chardb.h" -#include "resources/db/colordb.h" #include "resources/db/itemdb.h" #include "utils/gettext.h" diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 7bb96284e..fe4732725 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_CHARCREATEDIALOG_H -#define GUI_CHARCREATEDIALOG_H +#ifndef GUI_WINDOWS_CHARCREATEDIALOG_H +#define GUI_WINDOWS_CHARCREATEDIALOG_H #include "being/being.h" @@ -162,4 +162,4 @@ class CharCreateDialog final : public Window, unsigned mDirection; }; -#endif // GUI_CHARCREATEDIALOG_H +#endif // GUI_WINDOWS_CHARCREATEDIALOG_H diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 9556ba633..705cb831c 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_CHARSELECTDIALOG_H -#define GUI_CHARSELECTDIALOG_H +#ifndef GUI_WINDOWS_CHARSELECTDIALOG_H +#define GUI_WINDOWS_CHARSELECTDIALOG_H #include "main.h" @@ -123,4 +123,4 @@ class CharSelectDialog final : public Window, bool mSmallScreen; }; -#endif // GUI_CHARSELECTDIALOG_H +#endif // GUI_WINDOWS_CHARSELECTDIALOG_H diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index ee68e53c1..353212025 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -38,7 +38,6 @@ #include "input/inputmanager.h" #include "input/keyevent.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/sdlinput.h" #include "gui/viewport.h" diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 7137af08f..19a5022ab 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -20,15 +20,13 @@ * along with this program. If not, see . */ -#ifndef GUI_CHATWINDOW_H -#define GUI_CHATWINDOW_H +#ifndef GUI_WINDOWS_CHATWINDOW_H +#define GUI_WINDOWS_CHATWINDOW_H #include "depricatedlistener.h" #include "configlistener.h" -#include "utils/stringvector.h" - #include "gui/widgets/window.h" #include @@ -375,4 +373,4 @@ class ChatWindow final : public Window, extern ChatWindow *chatWindow; -#endif // GUI_CHATWINDOW_H +#endif // GUI_WINDOWS_CHATWINDOW_H diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h index 76e3c2d18..015117fac 100644 --- a/src/gui/windows/confirmdialog.h +++ b/src/gui/windows/confirmdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_CONFIRMDIALOG_H -#define GUI_CONFIRMDIALOG_H +#ifndef GUI_WINDOWS_CONFIRMDIALOG_H +#define GUI_WINDOWS_CONFIRMDIALOG_H #include "localconsts.h" @@ -62,4 +62,4 @@ class ConfirmDialog : public Window, public gcn::ActionListener TextBox *mTextBox; }; -#endif // GUI_CONFIRMDIALOG_H +#endif // GUI_WINDOWS_CONFIRMDIALOG_H diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index 21f29712c..6c7d298c5 100644 --- a/src/gui/windows/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_CONNECTIONDIALOG_H -#define GUI_CONNECTIONDIALOG_H +#ifndef GUI_WINDOWS_CONNECTIONDIALOG_H +#define GUI_WINDOWS_CONNECTIONDIALOG_H #include "client.h" @@ -61,4 +61,4 @@ class ConnectionDialog final : public Window, private gcn::ActionListener State mCancelState; }; -#endif // GUI_CONNECTIONDIALOG_H +#endif // GUI_WINDOWS_CONNECTIONDIALOG_H diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h index ef67df432..cd76c7a76 100644 --- a/src/gui/windows/debugwindow.h +++ b/src/gui/windows/debugwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_DEBUGWINDOW_H -#define GUI_DEBUGWINDOW_H +#ifndef GUI_WINDOWS_DEBUGWINDOW_H +#define GUI_WINDOWS_DEBUGWINDOW_H #include "gui/widgets/container.h" #include "gui/widgets/window.h" @@ -162,4 +162,4 @@ class DebugWindow final : public Window extern DebugWindow *debugWindow; -#endif // GUI_DEBUGWINDOW_H +#endif // GUI_WINDOWS_DEBUGWINDOW_H diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index 8c900d119..88c579d57 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/windows/setup.h" diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index 49cb07a8b..ed5b82913 100644 --- a/src/gui/windows/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_DIDYOUKNOWWINDOW_H -#define GUI_DIDYOUKNOWWINDOW_H +#ifndef GUI_WINDOWS_DIDYOUKNOWWINDOW_H +#define GUI_WINDOWS_DIDYOUKNOWWINDOW_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" @@ -75,4 +75,4 @@ class DidYouKnowWindow final : public Window, extern DidYouKnowWindow *didYouKnowWindow; -#endif // GUI_DIDYOUKNOWWINDOW_H +#endif // GUI_WINDOWS_DIDYOUKNOWWINDOW_H diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h index 6d3d191bc..4199b6791 100644 --- a/src/gui/windows/editdialog.h +++ b/src/gui/windows/editdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_EDITDIALOG_H -#define GUI_EDITDIALOG_H +#ifndef GUI_WINDOWS_EDITDIALOG_H +#define GUI_WINDOWS_EDITDIALOG_H #include "localconsts.h" @@ -66,4 +66,4 @@ class EditDialog final : public Window, public gcn::ActionListener TextField *mTextField; }; -#endif // GUI_EDITDIALOG_H +#endif // GUI_WINDOWS_EDITDIALOG_H diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index 531bb009a..6ab784eb3 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef GUI_EDITSERVERDIALOG_H -#define GUI_EDITSERVERDIALOG_H +#ifndef GUI_WINDOWS_EDITSERVERDIALOG_H +#define GUI_WINDOWS_EDITSERVERDIALOG_H class Button; class TextField; @@ -110,4 +110,4 @@ class EditServerDialog final : public Window, int mIndex; }; -#endif // GUI_EDITSERVERDIALOG_H +#endif // GUI_WINDOWS_EDITSERVERDIALOG_H diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h index b65c0c13c..44a401a88 100644 --- a/src/gui/windows/emotewindow.h +++ b/src/gui/windows/emotewindow.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef GUI_EMOTEWINDOW_H -#define GUI_EMOTEWINDOW_H +#ifndef GUI_WINDOWS_EMOTEWINDOW_H +#define GUI_WINDOWS_EMOTEWINDOW_H #include "gui/widgets/window.h" @@ -77,4 +77,4 @@ class EmoteWindow final : public Window extern EmoteWindow *emoteWindow; -#endif // GUI_EMOTEWINDOW_H +#endif // GUI_WINDOWS_EMOTEWINDOW_H diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 5fd69c23a..4100206ed 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_EQUIPMENTWINDOW_H -#define GUI_EQUIPMENTWINDOW_H +#ifndef GUI_WINDOWS_EQUIPMENTWINDOW_H +#define GUI_WINDOWS_EQUIPMENTWINDOW_H #include "equipment.h" #include "localconsts.h" @@ -152,4 +152,4 @@ class EquipmentWindow final : public Window, public gcn::ActionListener extern EquipmentWindow *equipmentWindow; extern EquipmentWindow *beingEquipmentWindow; -#endif // GUI_EQUIPMENTWINDOW_H +#endif // GUI_WINDOWS_EQUIPMENTWINDOW_H diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index db85ea0bd..ae9d783fb 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/windows/didyouknowwindow.h" diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h index 1419e0a10..c40390bc8 100644 --- a/src/gui/windows/helpwindow.h +++ b/src/gui/windows/helpwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_HELPWINDOW_H -#define GUI_HELPWINDOW_H +#ifndef GUI_WINDOWS_HELPWINDOW_H +#define GUI_WINDOWS_HELPWINDOW_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" @@ -90,4 +90,4 @@ class HelpWindow final : public Window, public LinkHandler, extern HelpWindow *helpWindow; -#endif // GUI_HELPWINDOW_H +#endif // GUI_WINDOWS_HELPWINDOW_H diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 50d40dfbc..75bd90edc 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -31,7 +31,6 @@ #include "input/inputmanager.h" #include "input/keyevent.h" -#include "gui/gui.h" #include "gui/viewport.h" #include "gui/popups/textpopup.h" @@ -56,8 +55,6 @@ #include "net/inventoryhandler.h" #include "net/net.h" -#include "resources/db/itemdb.h" - #include "utils/gettext.h" #include diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 7bd4ce466..7a2d1ec9f 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_INVENTORYWINDOW_H -#define GUI_INVENTORYWINDOW_H +#ifndef GUI_WINDOWS_INVENTORYWINDOW_H +#define GUI_WINDOWS_INVENTORYWINDOW_H #include "inventory.h" #include "depricatedlistener.h" @@ -193,4 +193,4 @@ class InventoryWindow final : public Window, extern InventoryWindow *inventoryWindow; -#endif // GUI_INVENTORYWINDOW_H +#endif // GUI_WINDOWS_INVENTORYWINDOW_H diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 1c95980fb..2e741a6cd 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_ITEMAMOUNTWINDOW_H -#define GUI_ITEMAMOUNTWINDOW_H +#ifndef GUI_WINDOWS_ITEMAMOUNTWINDOW_H +#define GUI_WINDOWS_ITEMAMOUNTWINDOW_H #include "gui/widgets/window.h" @@ -123,4 +123,4 @@ class ItemAmountWindow final : public Window, bool mEnabledKeyboard; }; -#endif // GUI_ITEMAMOUNTWINDOW_H +#endif // GUI_WINDOWS_ITEMAMOUNTWINDOW_H diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h index a5b59affb..160eebc1e 100644 --- a/src/gui/windows/killstats.h +++ b/src/gui/windows/killstats.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_KILLSTATS_H -#define GUI_KILLSTATS_H +#ifndef GUI_WINDOWS_KILLSTATS_H +#define GUI_WINDOWS_KILLSTATS_H #include @@ -129,4 +129,4 @@ class KillStats final : public Window, extern KillStats *killStats; -#endif // GUI_KILLSTATS_H +#endif // GUI_WINDOWS_KILLSTATS_H diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index fee0d4016..c520c89ce 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_LOGINDIALOG_H -#define GUI_LOGINDIALOG_H +#ifndef GUI_WINDOWS_LOGINDIALOG_H +#define GUI_WINDOWS_LOGINDIALOG_H #include "gui/widgets/window.h" @@ -105,4 +105,4 @@ class LoginDialog final : public Window, public gcn::ActionListener, std::string mServerName; }; -#endif // GUI_LOGINDIALOG_H +#endif // GUI_WINDOWS_LOGINDIALOG_H diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h index decacfec4..72517dae5 100644 --- a/src/gui/windows/minimap.h +++ b/src/gui/windows/minimap.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_MINIMAP_H -#define GUI_MINIMAP_H +#ifndef GUI_WINDOWS_MINIMAP_H +#define GUI_WINDOWS_MINIMAP_H #include "gui/widgets/window.h" @@ -86,4 +86,4 @@ class Minimap final : public Window, public ConfigListener extern Minimap *minimap; -#endif // GUI_MINIMAP_H +#endif // GUI_WINDOWS_MINIMAP_H diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 39d1e689d..947e71cb8 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_MINISTATUSWINDOW_H -#define GUI_MINISTATUSWINDOW_H +#ifndef GUI_WINDOWS_MINISTATUSWINDOW_H +#define GUI_WINDOWS_MINISTATUSWINDOW_H #include "inventory.h" #include "depricatedlistener.h" @@ -132,4 +132,4 @@ class MiniStatusWindow final : public Popup, extern MiniStatusWindow *miniStatusWindow; -#endif // GUI_MINISTATUSWINDOW_H +#endif // GUI_WINDOWS_MINISTATUSWINDOW_H diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index d67407ac9..f48e782d9 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_NPCDIALOG_H -#define GUI_NPCDIALOG_H +#ifndef GUI_WINDOWS_NPCDIALOG_H +#define GUI_WINDOWS_NPCDIALOG_H #include "configlistener.h" @@ -298,4 +298,4 @@ class NpcDialog final : public Window, bool mLogInteraction; }; -#endif // GUI_NPCDIALOG_H +#endif // GUI_WINDOWS_NPCDIALOG_H diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h index d9c31d6fd..9ac3537e2 100644 --- a/src/gui/windows/npcpostdialog.h +++ b/src/gui/windows/npcpostdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_NPCPOSTDIALOG_H -#define GUI_NPCPOSTDIALOG_H +#ifndef GUI_WINDOWS_NPCPOSTDIALOG_H +#define GUI_WINDOWS_NPCPOSTDIALOG_H #include "gui/widgets/window.h" @@ -71,4 +71,4 @@ class NpcPostDialog final : public Window, TextField *mSender; }; -#endif // GUI_NPCPOSTDIALOG_H +#endif // GUI_WINDOWS_NPCPOSTDIALOG_H diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 851590595..5917c8c3a 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_OKDIALOG_H -#define GUI_OKDIALOG_H +#ifndef GUI_WINDOWS_OKDIALOG_H +#define GUI_WINDOWS_OKDIALOG_H #include "localconsts.h" @@ -68,4 +68,4 @@ class OkDialog final : public Window, TextBox *mTextBox; }; -#endif // GUI_OKDIALOG_H +#endif // GUI_WINDOWS_OKDIALOG_H diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index 5f7d32e02..8aac4b1ac 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_OUTFITWINDOW_H -#define GUI_OUTFITWINDOW_H +#ifndef GUI_WINDOWS_OUTFITWINDOW_H +#define GUI_WINDOWS_OUTFITWINDOW_H #include "gui/widgets/window.h" @@ -126,4 +126,4 @@ class OutfitWindow final : public Window, extern OutfitWindow *outfitWindow; -#endif // GUI_OUTFITWINDOW_H +#endif // GUI_WINDOWS_OUTFITWINDOW_H diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 8baa2454c..7f320c18c 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -26,7 +26,6 @@ #include "being/localplayer.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index 72fdb7bb6..b5deb283f 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef GUI_QUESTSWINDOW_H -#define GUI_QUESTSWINDOW_H +#ifndef GUI_WINDOWS_QUESTSWINDOW_H +#define GUI_WINDOWS_QUESTSWINDOW_H #include "localconsts.h" @@ -103,4 +103,4 @@ class QuestsWindow final : public Window, extern QuestsWindow *questsWindow; -#endif // GUI_QUESTSWINDOW_H +#endif // GUI_WINDOWS_QUESTSWINDOW_H diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index b0bde98fc..efbdc586d 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_QUITDIALOG_H -#define GUI_QUITDIALOG_H +#ifndef GUI_WINDOWS_QUITDIALOG_H +#define GUI_WINDOWS_QUITDIALOG_H #include "gui/widgets/window.h" @@ -80,4 +80,4 @@ class QuitDialog final : public Window, public gcn::ActionListener, bool mNeedForceQuit; }; -#endif // GUI_QUITDIALOG_H +#endif // GUI_WINDOWS_QUITDIALOG_H diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index 0bc06b92d..7d2156f32 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_REGISTERDIALOG_H -#define GUI_REGISTERDIALOG_H +#ifndef GUI_WINDOWS_REGISTERDIALOG_H +#define GUI_WINDOWS_REGISTERDIALOG_H #include "gui/widgets/window.h" @@ -109,4 +109,4 @@ class RegisterDialog final : public Window, WrongDataNoticeListener *mWrongDataNoticeListener; }; -#endif // GUI_REGISTERDIALOG_H +#endif // GUI_WINDOWS_REGISTERDIALOG_H diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h index 532244845..3f51aad76 100644 --- a/src/gui/windows/selldialog.h +++ b/src/gui/windows/selldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SELLDIALOG_H -#define GUI_SELLDIALOG_H +#ifndef GUI_WINDOWS_SELLDIALOG_H +#define GUI_WINDOWS_SELLDIALOG_H #include "gui/widgets/window.h" @@ -144,4 +144,4 @@ class SellDialog final : public Window, std::string mNick; }; -#endif // GUI_SELLDIALOG_H +#endif // GUI_WINDOWS_SELLDIALOG_H diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 96eb20562..d69471eac 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -30,7 +30,6 @@ #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/windows/editserverdialog.h" diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index ea6954e15..95bcda706 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SERVERDIALOG_H -#define GUI_SERVERDIALOG_H +#ifndef GUI_WINDOWS_SERVERDIALOG_H +#define GUI_WINDOWS_SERVERDIALOG_H #include "gui/widgets/window.h" #include "gui/widgets/checkbox.h" @@ -191,4 +191,4 @@ class ServerDialog final : public Window, CheckBox *mPersistentIPCheckBox; }; -#endif // GUI_SERVERDIALOG_H +#endif // GUI_WINDOWS_SERVERDIALOG_H diff --git a/src/gui/windows/setup.h b/src/gui/windows/setup.h index aeb7cc635..5b299511b 100644 --- a/src/gui/windows/setup.h +++ b/src/gui/windows/setup.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SETUP_H -#define GUI_SETUP_H +#ifndef GUI_WINDOWS_SETUP_H +#define GUI_WINDOWS_SETUP_H #include "gui/widgets/tabbedarea.h" @@ -79,4 +79,4 @@ class Setup final : public Window, public gcn::ActionListener extern Setup* setupWindow; -#endif // GUI_SETUP_H +#endif // GUI_WINDOWS_SETUP_H diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 6352f6721..bf7a61c4a 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SHOPWINDOW_H -#define GUI_SHOPWINDOW_H +#ifndef GUI_WINDOWS_SHOPWINDOW_H +#define GUI_WINDOWS_SHOPWINDOW_H #include "gui/widgets/window.h" @@ -176,4 +176,4 @@ class ShopWindow final : public Window, extern ShopWindow *shopWindow; -#endif // GUI_SHOPWINDOW_H +#endif // GUI_WINDOWS_SHOPWINDOW_H diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index cc2ba97b0..c8fb91b4c 100644 --- a/src/gui/windows/shortcutwindow.h +++ b/src/gui/windows/shortcutwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SHORTCUTWINDOW_H -#define GUI_SHORTCUTWINDOW_H +#ifndef GUI_WINDOWS_SHORTCUTWINDOW_H +#define GUI_WINDOWS_SHORTCUTWINDOW_H #include "gui/widgets/window.h" @@ -87,4 +87,4 @@ extern ShortcutWindow *itemShortcutWindow; extern ShortcutWindow *emoteShortcutWindow; extern ShortcutWindow *dropShortcutWindow; -#endif // GUI_SHORTCUTWINDOW_H +#endif // GUI_WINDOWS_SHORTCUTWINDOW_H diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 9715a3bf3..1569bd5b9 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SKILLDIALOG_H -#define GUI_SKILLDIALOG_H +#ifndef GUI_WINDOWS_SKILLDIALOG_H +#define GUI_WINDOWS_SKILLDIALOG_H #include "gui/widgets/window.h" @@ -106,4 +106,4 @@ class SkillDialog final : public Window, public gcn::ActionListener extern SkillDialog *skillDialog; -#endif // GUI_SKILLDIALOG_H +#endif // GUI_WINDOWS_SKILLDIALOG_H diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index 31d1b676a..c1833cd0a 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef GUI_SOCIALWINDOW_H -#define GUI_SOCIALWINDOW_H +#ifndef GUI_WINDOWS_SOCIALWINDOW_H +#define GUI_WINDOWS_SOCIALWINDOW_H #include "gui/widgets/window.h" @@ -167,4 +167,4 @@ protected: extern SocialWindow *socialWindow; -#endif // GUI_SOCIALWINDOW_H +#endif // GUI_WINDOWS_SOCIALWINDOW_H diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index eebcd12ca..5acccd9ff 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_STATUSWINDOW_H -#define GUI_STATUSWINDOW_H +#ifndef GUI_WINDOWS_STATUSWINDOW_H +#define GUI_WINDOWS_STATUSWINDOW_H #include "depricatedlistener.h" @@ -122,4 +122,4 @@ class StatusWindow final : public Window, extern StatusWindow *statusWindow; -#endif // GUI_STATUSWINDOW_H +#endif // GUI_WINDOWS_STATUSWINDOW_H diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 610b014d5..1a1138b3a 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_TEXTCOMMANDEDITOR_H -#define GUI_TEXTCOMMANDEDITOR_H +#ifndef GUI_WINDOWS_TEXTCOMMANDEDITOR_H +#define GUI_WINDOWS_TEXTCOMMANDEDITOR_H #include "gui/widgets/window.h" @@ -100,4 +100,4 @@ class TextCommandEditor final : public Window, public gcn::ActionListener bool mEnabledKeyboard; }; -#endif // GUI_TEXTCOMMANDEDITOR_H +#endif // GUI_WINDOWS_TEXTCOMMANDEDITOR_H diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h index 9f9292ef6..f3f4612de 100644 --- a/src/gui/windows/textdialog.h +++ b/src/gui/windows/textdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_TEXTDIALOG_H -#define GUI_TEXTDIALOG_H +#ifndef GUI_WINDOWS_TEXTDIALOG_H +#define GUI_WINDOWS_TEXTDIALOG_H #include "gui/widgets/window.h" @@ -77,4 +77,4 @@ private: bool mEnabledKeyboard; }; -#endif // GUI_TEXTDIALOG_H +#endif // GUI_WINDOWS_TEXTDIALOG_H diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 3f0159340..1e25ae862 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -31,7 +31,6 @@ #include "being/playerinfo.h" #include "being/playerrelations.h" -#include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/windows/inventorywindow.h" diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index df6d8a80a..fbd516d9d 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_TRADEWINDOW_H -#define GUI_TRADEWINDOW_H +#ifndef GUI_WINDOWS_TRADEWINDOW_H +#define GUI_WINDOWS_TRADEWINDOW_H #include "gui/widgets/window.h" @@ -184,4 +184,4 @@ class TradeWindow final : public Window, extern TradeWindow *tradeWindow; -#endif // GUI_TRADEWINDOW_H +#endif // GUI_WINDOWS_TRADEWINDOW_H diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index de0da27bb..63155d2eb 100644 --- a/src/gui/windows/unregisterdialog.h +++ b/src/gui/windows/unregisterdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_UNREGISTERDIALOG_H -#define GUI_UNREGISTERDIALOG_H +#ifndef GUI_WINDOWS_UNREGISTERDIALOG_H +#define GUI_WINDOWS_UNREGISTERDIALOG_H #include "gui/widgets/window.h" @@ -67,4 +67,4 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener WrongDataNoticeListener *mWrongDataNoticeListener; }; -#endif // GUI_UNREGISTERDIALOG_H +#endif // GUI_WINDOWS_UNREGISTERDIALOG_H diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index e317e3f95..b96616cbc 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_UPDATERWINDOW_H -#define GUI_UPDATERWINDOW_H +#ifndef GUI_WINDOWS_UPDATERWINDOW_H +#define GUI_WINDOWS_UPDATERWINDOW_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" @@ -255,4 +255,4 @@ private: std::string mUpdateServerPath; }; -#endif // GUI_UPDATERWINDOW_H +#endif // GUI_WINDOWS_UPDATERWINDOW_H diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 5a48a8a03..847cd0f32 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WHOISONLINE_H -#define GUI_WHOISONLINE_H +#ifndef GUI_WINDOWS_WHOISONLINE_H +#define GUI_WINDOWS_WHOISONLINE_H #include "configlistener.h" @@ -220,4 +220,4 @@ private: extern WhoIsOnline *whoIsOnline; -#endif // GUI_WHOISONLINE_H +#endif // GUI_WINDOWS_WHOISONLINE_H diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index ace7fd63c..d3107a807 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef GUI_WORLDSELECTDIALOG_H -#define GUI_WORLDSELECTDIALOG_H +#ifndef GUI_WINDOWS_WORLDSELECTDIALOG_H +#define GUI_WINDOWS_WORLDSELECTDIALOG_H #include "gui/widgets/window.h" @@ -71,4 +71,4 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener, Button *mChooseWorld; }; -#endif // GUI_WORLDSELECTDIALOG_H +#endif // GUI_WINDOWS_WORLDSELECTDIALOG_H diff --git a/src/map.h b/src/map.h index a4393b832..320d3232c 100644 --- a/src/map.h +++ b/src/map.h @@ -221,7 +221,8 @@ class Map final : public Properties, public ConfigListener /** * Get tile reference. */ - const MetaTile *getMetaTile(const int x, const int y) const A_WARN_UNUSED; + const MetaTile *getMetaTile(const int x, + const int y) const A_WARN_UNUSED; /** * Marks a tile as occupied. diff --git a/src/render/mgl.h b/src/render/mgl.h index 335ee48f1..4e97a8553 100644 --- a/src/render/mgl.h +++ b/src/render/mgl.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef MGL_H -#define MGL_H +#ifndef RENDER_MGL_H +#define RENDER_MGL_H #include "main.h" #ifdef USE_OPENGL @@ -133,4 +133,4 @@ defNameE(wglGetExtensionsString); #endif #endif -#endif // MGL_H +#endif // RENDER_MGL_H diff --git a/src/resources/db/avatardb.h b/src/resources/db/avatardb.h index e5af78ff7..8e6e0ddc1 100644 --- a/src/resources/db/avatardb.h +++ b/src/resources/db/avatardb.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_AVATARDB_H -#define RESOURCES_AVATARDB_H +#ifndef RESOURCES_DB_AVATARDB_H +#define RESOURCES_DB_AVATARDB_H #include "localconsts.h" @@ -36,4 +36,4 @@ namespace AvatarDB BeingInfo *get(const int id) A_WARN_UNUSED; } -#endif // RESOURCES_AVATARDB_H +#endif // RESOURCES_DB_AVATARDB_H diff --git a/src/resources/db/chardb.h b/src/resources/db/chardb.h index 3072d41ff..ea51e7358 100644 --- a/src/resources/db/chardb.h +++ b/src/resources/db/chardb.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_CHARDB_H -#define RESOURCES_CHARDB_H +#ifndef RESOURCES_DB_CHARDB_H +#define RESOURCES_DB_CHARDB_H #include "utils/xml.h" @@ -65,4 +65,4 @@ namespace CharDB const std::vector &getDefaultItems() A_WARN_UNUSED; } // namespace CharDB -#endif // RESOURCES_CHARDB_H +#endif // RESOURCES_DB_CHARDB_H diff --git a/src/resources/db/colordb.h b/src/resources/db/colordb.h index 3eec3625d..f7e3bbee1 100644 --- a/src/resources/db/colordb.h +++ b/src/resources/db/colordb.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_COLORDB_H -#define RESOURCES_COLORDB_H +#ifndef RESOURCES_DB_COLORDB_H +#define RESOURCES_DB_COLORDB_H #include #include @@ -85,4 +85,4 @@ namespace ColorDB typedef ColorLists::iterator ColorListsIterator; } // namespace ColorDB -#endif // RESOURCES_COLORDB_H +#endif // RESOURCES_DB_COLORDB_H diff --git a/src/resources/db/deaddb.h b/src/resources/db/deaddb.h index a0f6c7b9b..bb0394893 100644 --- a/src/resources/db/deaddb.h +++ b/src/resources/db/deaddb.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_DEADDB_H -#define RESOURCES_DEADDB_H +#ifndef RESOURCES_DB_DEADDB_H +#define RESOURCES_DB_DEADDB_H #include @@ -41,4 +41,4 @@ namespace DeadDB std::string getRandomString(); } // namespace DeadDB -#endif // RESOURCES_DEADDB_H +#endif // RESOURCES_DB_DEADDB_H diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h index b0b232653..59d1547f0 100644 --- a/src/resources/db/emotedb.h +++ b/src/resources/db/emotedb.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_EMOTEDB_H -#define RESOURCES_EMOTEDB_H +#ifndef RESOURCES_DB_EMOTEDB_H +#define RESOURCES_DB_EMOTEDB_H #include "utils/stringvector.h" @@ -84,4 +84,4 @@ namespace EmoteDB typedef EmoteInfos::iterator EmoteInfosIterator; } // namespace EmoteDB -#endif // RESOURCES_EMOTEDB_H +#endif // RESOURCES_DB_EMOTEDB_H diff --git a/src/resources/db/itemdb.h b/src/resources/db/itemdb.h index 1a5a4cce8..a603f42e4 100644 --- a/src/resources/db/itemdb.h +++ b/src/resources/db/itemdb.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_ITEMDB_H -#define RESOURCES_ITEMDB_H +#ifndef RESOURCES_DB_ITEMDB_H +#define RESOURCES_DB_ITEMDB_H #include "utils/stringvector.h" @@ -72,4 +72,4 @@ namespace ItemDB void setStatsList(const std::vector &stats); } // namespace ItemDB -#endif // RESOURCES_ITEMDB_H +#endif // RESOURCES_DB_ITEMDB_H diff --git a/src/resources/db/mapdb.h b/src/resources/db/mapdb.h index 9e0407f66..ed3d131bd 100644 --- a/src/resources/db/mapdb.h +++ b/src/resources/db/mapdb.h @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_MAPDB_H -#define RESOURCES_MAPDB_H +#ifndef RESOURCES_DB_MAPDB_H +#define RESOURCES_DB_MAPDB_H #include "utils/stringvector.h" @@ -75,4 +75,4 @@ namespace MapDB typedef Atlases::const_iterator AtlasCIter; } // namespace MapDB -#endif // RESOURCES_MAPDB_H +#endif // RESOURCES_DB_MAPDB_H diff --git a/src/resources/db/monsterdb.h b/src/resources/db/monsterdb.h index 426228388..d81585b39 100644 --- a/src/resources/db/monsterdb.h +++ b/src/resources/db/monsterdb.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_MONSTERDB_H -#define RESOURCES_MONSTERDB_H +#ifndef RESOURCES_DB_MONSTERDB_H +#define RESOURCES_DB_MONSTERDB_H #include "localconsts.h" @@ -43,4 +43,4 @@ namespace MonsterDB BeingInfo *get(const int id) A_WARN_UNUSED; } -#endif // RESOURCES_MONSTERDB_H +#endif // RESOURCES_DB_MONSTERDB_H diff --git a/src/resources/db/npcdb.h b/src/resources/db/npcdb.h index 9614c2052..75215e0dd 100644 --- a/src/resources/db/npcdb.h +++ b/src/resources/db/npcdb.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_NPCDB_H -#define RESOURCES_NPCDB_H +#ifndef RESOURCES_DB_NPCDB_H +#define RESOURCES_DB_NPCDB_H #include @@ -47,4 +47,4 @@ namespace NPCDB void loadXmlFile(const std::string &fileName); } // namespace NPCDB -#endif // RESOURCES_NPCDB_H +#endif // RESOURCES_DB_NPCDB_H diff --git a/src/resources/db/palettedb.h b/src/resources/db/palettedb.h index 307178693..3465dd538 100644 --- a/src/resources/db/palettedb.h +++ b/src/resources/db/palettedb.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_PALETTEDB_H -#define RESOURCES_PALETTEDB_H +#ifndef RESOURCES_DB_PALETTEDB_H +#define RESOURCES_DB_PALETTEDB_H #include "localconsts.h" @@ -36,4 +36,4 @@ namespace PaletteDB } // namespace PaletteDB -#endif // RESOURCES_PALETTEDB_H +#endif // RESOURCES_DB_PALETTEDB_H diff --git a/src/resources/db/petdb.h b/src/resources/db/petdb.h index d5e4b5613..5a5175f34 100644 --- a/src/resources/db/petdb.h +++ b/src/resources/db/petdb.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_PETDB_H -#define RESOURCES_PETDB_H +#ifndef RESOURCES_DB_PETDB_H +#define RESOURCES_DB_PETDB_H #include "localconsts.h" @@ -36,4 +36,4 @@ namespace PETDB BeingInfo *get(const int id) A_WARN_UNUSED; } -#endif // RESOURCES_PETDB_H +#endif // RESOURCES_DB_PETDB_H diff --git a/src/resources/db/sounddb.h b/src/resources/db/sounddb.h index 356cd4e13..29a165cd7 100644 --- a/src/resources/db/sounddb.h +++ b/src/resources/db/sounddb.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef RESOURCES_SOUNDDB_H -#define RESOURCES_SOUNDDB_H +#ifndef RESOURCES_DB_SOUNDDB_H +#define RESOURCES_DB_SOUNDDB_H #include @@ -34,4 +34,4 @@ namespace SoundDB std::string &getSound(const int id); } -#endif // RESOURCES_SOUNDDB_H +#endif // RESOURCES_DB_SOUNDDB_H diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp index ad958ba82..57e763c8d 100644 --- a/src/touchmanager.cpp +++ b/src/touchmanager.cpp @@ -382,6 +382,7 @@ void TouchManager::loadButtons() { // 2x1 case 0: + default: { loadTouchItem(&mButtons[1], "dbutton.xml", "dbutton_image.xml", x, y, sz, sz, RIGHT, "screenActionButton1", ""); @@ -468,8 +469,9 @@ void TouchManager::loadButtons() loadTouchItem(&mButtons[11], "dbutton.xml", "dbutton_image.xml", x, y, sz, sz, RIGHT, "screenActionButton11", ""); - loadTouchItem(&mButtons[10], "dbutton.xml", "dbutton_image.xml", - skipWidth, y, sz, sz, RIGHT, "screenActionButton10", ""); + loadTouchItem(&mButtons[10], "dbutton.xml", + "dbutton_image.xml", skipWidth, y, sz, sz, RIGHT, + "screenActionButton10", ""); loadTouchItem(&mButtons[9], "dbutton.xml", "dbutton_image.xml", skipWidth2, y, sz, sz, RIGHT, "screenActionButton9", ""); loadTouchItem(&mButtons[8], "dbutton.xml", "dbutton_image.xml", -- cgit v1.2.3-70-g09d2