diff options
147 files changed, 411 insertions, 408 deletions
diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h index 417adc42e..440242778 100644 --- a/src/gui/beingpopup.h +++ b/src/gui/beingpopup.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BEINGPOPUP_H -#define BEINGPOPUP_H +#ifndef GUI_BEINGPOPUP_H +#define GUI_BEINGPOPUP_H #include "gui/widgets/popup.h" @@ -58,4 +58,4 @@ class BeingPopup final : public Popup Label *mBeingComment; }; -#endif // BEINGPOPUP_H +#endif // GUI_BEINGPOPUP_H diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h index 18d3efc8e..53eeca01c 100644 --- a/src/gui/botcheckerwindow.h +++ b/src/gui/botcheckerwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BOTCHECKER_H -#define BOTCHECKER_H +#ifndef GUI_BOTCHECKERWINDOW_H +#define GUI_BOTCHECKERWINDOW_H #include "configlistener.h" @@ -89,4 +89,4 @@ class BotCheckerWindow final : public Window, extern BotCheckerWindow *botCheckerWindow; -#endif +#endif // GUI_BOTCHECKERWINDOW_H diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h index 1dd552c80..35cc2d8db 100644 --- a/src/gui/buydialog.h +++ b/src/gui/buydialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BUYDIALOG_H -#define BUYDIALOG_H +#ifndef GUI_BUYDIALOG_H +#define GUI_BUYDIALOG_H #include "gui/widgets/window.h" @@ -151,4 +151,4 @@ class BuyDialog final : public Window, DropDown *mSortDropDown; }; -#endif +#endif // GUI_BUYDIALOG_H diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h index 391d90793..74cf5d932 100644 --- a/src/gui/buyselldialog.h +++ b/src/gui/buyselldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BUYSELLDIALOG_H -#define BUYSELLDIALOG_H +#ifndef GUI_BUYSELLDIALOG_H +#define GUI_BUYSELLDIALOG_H #include "gui/widgets/window.h" @@ -80,4 +80,4 @@ class BuySellDialog final : public Window, public gcn::ActionListener Button *mBuyButton; }; -#endif +#endif // GUI_BUYSELLDIALOG_H diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index b6b2c5285..5271ec767 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_CHANGEEMAIL_H -#define GUI_CHANGEEMAIL_H +#ifndef GUI_CHANGEEMAILDIALOG_H +#define GUI_CHANGEEMAILDIALOG_H #include "gui/widgets/window.h" @@ -78,4 +78,4 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener LoginData *mLoginData; }; -#endif // GUI_CHANGEEMAIL_H +#endif // GUI_CHANGEEMAILDIALOG_H diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index a7563ce52..e67e9af68 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHANGEPASSWORDDIALOG_H -#define CHANGEPASSWORDDIALOG_H +#ifndef GUI_CHANGEPASSWORDDIALOG_H +#define GUI_CHANGEPASSWORDDIALOG_H #include "gui/widgets/window.h" @@ -73,4 +73,4 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener LoginData *mLoginData; }; -#endif +#endif // GUI_CHANGEPASSWORDDIALOG_H diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index 0cfe03ebd..69ae1af1a 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHAR_CREATE_DIALOG_H -#define CHAR_CREATE_DIALOG_H +#ifndef GUI_CHARCREATEDIALOG_H +#define GUI_CHARCREATEDIALOG_H #include "being.h" @@ -154,4 +154,4 @@ class CharCreateDialog final : public Window, unsigned mDirection; }; -#endif // CHAR_CREATE_DIALOG_H +#endif // GUI_CHARCREATEDIALOG_H diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 8cdaf631d..8078a2d21 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHAR_SELECT_H -#define CHAR_SELECT_H +#ifndef GUI_CHARSELECTDIALOG_H +#define GUI_CHARSELECTDIALOG_H #include "being.h" #include "main.h" @@ -131,4 +131,4 @@ class CharSelectDialog final : public Window, bool mSmallScreen; }; -#endif +#endif // GUI_CHARSELECTDIALOG_H diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index e0a60a82d..9c7ae9596 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHATWINDOW_H -#define CHATWINDOW_H +#ifndef GUI_CHATWINDOW_H +#define GUI_CHATWINDOW_H #include "depricatedlistener.h" @@ -372,4 +372,4 @@ class ChatWindow final : public Window, extern ChatWindow *chatWindow; -#endif +#endif // GUI_CHATWINDOW_H diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h index 392cd9e24..70eb10124 100644 --- a/src/gui/confirmdialog.h +++ b/src/gui/confirmdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef OPTION_DIALOG_H -#define OPTION_DIALOG_H +#ifndef GUI_CONFIRMDIALOG_H +#define GUI_CONFIRMDIALOG_H #include "localconsts.h" @@ -59,4 +59,4 @@ class ConfirmDialog : public Window, public gcn::ActionListener TextBox *mTextBox; }; -#endif +#endif // GUI_CONFIRMDIALOG_H diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h index 391824101..21f29712c 100644 --- a/src/gui/connectiondialog.h +++ b/src/gui/connectiondialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONNECTION_H -#define CONNECTION_H +#ifndef GUI_CONNECTIONDIALOG_H +#define GUI_CONNECTIONDIALOG_H #include "client.h" @@ -61,4 +61,4 @@ class ConnectionDialog final : public Window, private gcn::ActionListener State mCancelState; }; -#endif +#endif // GUI_CONNECTIONDIALOG_H diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index 26bedf9ce..972378708 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEBUGWINDOW_H -#define DEBUGWINDOW_H +#ifndef GUI_DEBUGWINDOW_H +#define GUI_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 +#endif // GUI_DEBUGWINDOW_H diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h index 71fd4d604..1e2f63662 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/didyouknowwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DIDYOUKNOWWINDOW_H -#define DIDYOUKNOWWINDOW_H +#ifndef GUI_DIDYOUKNOWWINDOW_H +#define GUI_DIDYOUKNOWWINDOW_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" @@ -76,4 +76,4 @@ class DidYouKnowWindow final : public Window, extern DidYouKnowWindow *didYouKnowWindow; -#endif +#endif // GUI_DIDYOUKNOWWINDOW_H diff --git a/src/gui/editdialog.h b/src/gui/editdialog.h index 00167bdac..bb5bf7e9e 100644 --- a/src/gui/editdialog.h +++ b/src/gui/editdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EDIT_DIALOG_H -#define EDIT_DIALOG_H +#ifndef GUI_EDITDIALOG_H +#define GUI_EDITDIALOG_H #include "localconsts.h" @@ -68,4 +68,4 @@ class EditDialog final : public Window, public gcn::ActionListener TextField *mTextField; }; -#endif +#endif // GUI_EDITDIALOG_H diff --git a/src/gui/editserverdialog.h b/src/gui/editserverdialog.h index 383b8e795..a8503ac6a 100644 --- a/src/gui/editserverdialog.h +++ b/src/gui/editserverdialog.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EDITSERVERDIALOG_H -#define EDITSERVERDIALOG_H +#ifndef GUI_EDITSERVERDIALOG_H +#define GUI_EDITSERVERDIALOG_H class Button; class Label; @@ -112,4 +112,4 @@ class EditServerDialog final : public Window, int mIndex; }; -#endif // EDITSERVERDIALOG_H +#endif // GUI_EDITSERVERDIALOG_H diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index e14a9916b..2ac36c366 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EQUIPMENTWINDOW_H -#define EQUIPMENTWINDOW_H +#ifndef GUI_EQUIPMENTWINDOW_H +#define GUI_EQUIPMENTWINDOW_H #include "equipment.h" #include "localconsts.h" @@ -153,4 +153,4 @@ class EquipmentWindow final : public Window, public gcn::ActionListener extern EquipmentWindow *equipmentWindow; extern EquipmentWindow *beingEquipmentWindow; -#endif +#endif // GUI_EQUIPMENTWINDOW_H diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 021469321..d1691d965 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FOCUSHANDLER_H -#define FOCUSHANDLER_H +#ifndef GUI_FOCUSHANDLER_H +#define GUI_FOCUSHANDLER_H #include <guichan/focushandler.hpp> @@ -86,4 +86,4 @@ class FocusHandler final : public gcn::FocusHandler std::list<gcn::Widget*> mModalStack; }; -#endif +#endif // GUI_FOCUSHANDLER_H diff --git a/src/gui/gui.h b/src/gui/gui.h index 7b4fefab6..ed6bf6774 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_H -#define GUI_H +#ifndef GUI_GUI_H +#define GUI_GUI_H #include "resources/cursor.h" #include "resources/image.h" @@ -191,4 +191,4 @@ extern SDLInput *guiInput; /**< GUI input */ */ extern SDLFont *boldFont; -#endif // GUI_H +#endif // GUI_GUI_H diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index cec27aa75..df3ac4c0f 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef HELPWINDOW_H -#define HELPWINDOW_H +#ifndef GUI_HELPWINDOW_H +#define GUI_HELPWINDOW_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" @@ -91,4 +91,4 @@ class HelpWindow final : public Window, public LinkHandler, extern HelpWindow *helpWindow; -#endif +#endif // GUI_HELPWINDOW_H diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 74e16d5f2..16df44890 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INVENTORYWINDOW_H -#define INVENTORYWINDOW_H +#ifndef GUI_INVENTORYWINDOW_H +#define GUI_INVENTORYWINDOW_H #include "inventory.h" #include "depricatedlistener.h" @@ -194,4 +194,4 @@ class InventoryWindow final : public Window, extern InventoryWindow *inventoryWindow; -#endif +#endif // GUI_INVENTORYWINDOW_H diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h index 7ab8922f7..1c95980fb 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/itemamountwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEM_AMOUNT_WINDOW_H -#define ITEM_AMOUNT_WINDOW_H +#ifndef GUI_ITEMAMOUNTWINDOW_H +#define GUI_ITEMAMOUNTWINDOW_H #include "gui/widgets/window.h" @@ -123,4 +123,4 @@ class ItemAmountWindow final : public Window, bool mEnabledKeyboard; }; -#endif // ITEM_AMOUNT_WINDOW_H +#endif // GUI_ITEMAMOUNTWINDOW_H diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 8bd574006..3d1cc1d7f 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEMPOPUP_H -#define ITEMPOPUP_H +#ifndef GUI_ITEMPOPUP_H +#define GUI_ITEMPOPUP_H #include "gui/widgets/popup.h" @@ -78,4 +78,4 @@ class ItemPopup final : public Popup void setLabelColor(Label *label, const ItemType type) const; }; -#endif // ITEMPOPUP_H +#endif // GUI_ITEMPOPUP_H diff --git a/src/gui/killstats.h b/src/gui/killstats.h index 78c793077..02a7d1c9c 100644 --- a/src/gui/killstats.h +++ b/src/gui/killstats.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef KILLSTATS_H -#define KILLSTATS_H +#ifndef GUI_KILLSTATS_H +#define GUI_KILLSTATS_H #include <guichan/actionlistener.hpp> @@ -130,4 +130,4 @@ class KillStats final : public Window, extern KillStats *killStats; -#endif +#endif // GUI_KILLSTATS_H diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h index dbe2fa167..f917d6b0e 100644 --- a/src/gui/logindialog.h +++ b/src/gui/logindialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LOGINDIALOG_H -#define LOGINDIALOG_H +#ifndef GUI_LOGINDIALOG_H +#define GUI_LOGINDIALOG_H #include "gui/widgets/window.h" @@ -107,4 +107,4 @@ class LoginDialog final : public Window, public gcn::ActionListener, std::string mServerName; }; -#endif +#endif // GUI_LOGINDIALOG_H diff --git a/src/gui/minimap.h b/src/gui/minimap.h index fab7efea9..decacfec4 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MINIMAP_H -#define MINIMAP_H +#ifndef GUI_MINIMAP_H +#define GUI_MINIMAP_H #include "gui/widgets/window.h" @@ -86,4 +86,4 @@ class Minimap final : public Window, public ConfigListener extern Minimap *minimap; -#endif +#endif // GUI_MINIMAP_H diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index c95bb7602..023276e94 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MINISTATUSWINDOW_H -#define MINISTATUSWINDOW_H +#ifndef GUI_MINISTATUSWINDOW_H +#define GUI_MINISTATUSWINDOW_H #include "inventory.h" #include "depricatedlistener.h" @@ -128,4 +128,4 @@ class MiniStatusWindow final : public Popup, extern MiniStatusWindow *miniStatusWindow; -#endif +#endif // GUI_MINISTATUSWINDOW_H diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index b0208755b..3cdb39511 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NPCDIALOG_H -#define NPCDIALOG_H +#ifndef GUI_NPCDIALOG_H +#define GUI_NPCDIALOG_H #include "configlistener.h" @@ -276,4 +276,4 @@ class NpcDialog final : public Window, bool mLogInteraction; }; -#endif // NPCDIALOG_H +#endif // GUI_NPCDIALOG_H diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h index 0340de324..d9c31d6fd 100644 --- a/src/gui/npcpostdialog.h +++ b/src/gui/npcpostdialog.h @@ -71,4 +71,4 @@ class NpcPostDialog final : public Window, TextField *mSender; }; -#endif +#endif // GUI_NPCPOSTDIALOG_H diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h index 2430660d6..851590595 100644 --- a/src/gui/okdialog.h +++ b/src/gui/okdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef OK_DIALOG_H -#define OK_DIALOG_H +#ifndef GUI_OKDIALOG_H +#define GUI_OKDIALOG_H #include "localconsts.h" @@ -68,4 +68,4 @@ class OkDialog final : public Window, TextBox *mTextBox; }; -#endif +#endif // GUI_OKDIALOG_H diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index cc17e1839..7a5638f01 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef OUTFITWINDOW_H -#define OUTFITWINDOW_H +#ifndef GUI_OUTFITWINDOW_H +#define GUI_OUTFITWINDOW_H #include "gui/widgets/window.h" @@ -141,4 +141,4 @@ class OutfitWindow final : public Window, extern OutfitWindow *outfitWindow; -#endif +#endif // GUI_OUTFITWINDOW_H diff --git a/src/gui/palette.h b/src/gui/palette.h index e842b23a5..93cad1559 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PALETTE_H -#define PALETTE_H +#ifndef GUI_PALETTE_H +#define GUI_PALETTE_H #include "logger.h" #include "utils/stringutils.h" @@ -214,4 +214,4 @@ class Palette std::vector<ColorElem*> mGradVector; }; -#endif +#endif // GUI_PALETTE_H diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index de52c9c17..ef2c10ff0 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef POPUP_MENU_H -#define POPUP_MENU_H +#ifndef GUI_POPUPMENU_H +#define GUI_POPUPMENU_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" @@ -229,4 +229,4 @@ class PopupMenu final : public Popup, public LinkHandler void showPopup(int x, int y); }; -#endif +#endif // GUI_POPUPMENU_H diff --git a/src/gui/questswindow.h b/src/gui/questswindow.h index c38522172..0d45881af 100644 --- a/src/gui/questswindow.h +++ b/src/gui/questswindow.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef QUESTS_WINDOW_H -#define QUESTS_WINDOW_H +#ifndef GUI_QUESTSWINDOW_H +#define GUI_QUESTSWINDOW_H #include "localconsts.h" @@ -103,4 +103,4 @@ class QuestsWindow final : public Window, extern QuestsWindow *questsWindow; -#endif +#endif // GUI_QUESTSWINDOW_H diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index e6181746e..b0bde98fc 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef QUITDIALOG_H -#define QUITDIALOG_H +#ifndef GUI_QUITDIALOG_H +#define GUI_QUITDIALOG_H #include "gui/widgets/window.h" @@ -80,4 +80,4 @@ class QuitDialog final : public Window, public gcn::ActionListener, bool mNeedForceQuit; }; -#endif +#endif // GUI_QUITDIALOG_H diff --git a/src/gui/registerdialog.h b/src/gui/registerdialog.h index 548c720a8..dcdafe04e 100644 --- a/src/gui/registerdialog.h +++ b/src/gui/registerdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef REGISTERDIALOG_H -#define REGISTERDIALOG_H +#ifndef GUI_REGISTERDIALOG_H +#define GUI_REGISTERDIALOG_H #include "gui/widgets/window.h" @@ -112,4 +112,4 @@ class RegisterDialog final : public Window, WrongDataNoticeListener *mWrongDataNoticeListener; }; -#endif +#endif // GUI_REGISTERDIALOG_H diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index 30b4d2fa4..6863abb83 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SDLFONT_H -#define SDLFONT_H +#ifndef GUI_SDLFONT_H +#define GUI_SDLFONT_H #include <guichan/color.hpp> #include <guichan/font.hpp> @@ -167,4 +167,4 @@ class SDLFont final : public gcn::Font extern int sdlTextChunkCnt; #endif -#endif +#endif // GUI_SDLFONT_H diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index eaf6f4cf5..5d632142f 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -56,8 +56,8 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SDLINPUT_H -#define SDLINPUT_H +#ifndef GUI_SDLINPUT_H +#define GUI_SDLINPUT_H #include "keyinput.h" @@ -196,4 +196,4 @@ protected: bool mMouseInWindow; }; -#endif +#endif // GUI_SDLINPUT_H diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index 91dcf74c8..7a5cf65d1 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SELLDIALOG_H -#define SELLDIALOG_H +#ifndef GUI_SELLDIALOG_H +#define GUI_SELLDIALOG_H #include "gui/widgets/window.h" @@ -146,4 +146,4 @@ class SellDialog final : public Window, std::string mNick; }; -#endif +#endif // GUI_SELLDIALOG_H diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index 4969e2487..d884937b8 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SERVERDIALOG_H -#define SERVERDIALOG_H +#ifndef GUI_SERVERDIALOG_H +#define GUI_SERVERDIALOG_H #include "gui/widgets/window.h" #include "gui/widgets/checkbox.h" @@ -194,4 +194,4 @@ class ServerDialog : public Window, CheckBox *mPersistentIPCheckBox; }; -#endif +#endif // GUI_SERVERDIALOG_H diff --git a/src/gui/setup.h b/src/gui/setup.h index 6bba210af..aeb7cc635 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SETUP_H -#define SETUP_H +#ifndef GUI_SETUP_H +#define GUI_SETUP_H #include "gui/widgets/tabbedarea.h" @@ -79,4 +79,4 @@ class Setup final : public Window, public gcn::ActionListener extern Setup* setupWindow; -#endif +#endif // GUI_SETUP_H diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 1100228b2..26a4326d8 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -44,4 +44,4 @@ class Setup_Audio final : public SetupTabScroll SetupItemNames *mChannelsList; }; -#endif +#endif // GUI_SETUP_AUDIO_H diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h index 03b33bc49..ac01f9e28 100644 --- a/src/gui/setup_chat.h +++ b/src/gui/setup_chat.h @@ -40,4 +40,4 @@ class Setup_Chat final : public SetupTabScroll void externalUpdated() override; }; -#endif +#endif // GUI_SETUP_CHAT_H diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index e75b47287..b3ad3a3e9 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SETUP_COLORS_H -#define SETUP_COLORS_H +#ifndef GUI_SETUP_COLORS_H +#define GUI_SETUP_COLORS_H #include "gui/widgets/setuptab.h" @@ -93,4 +93,4 @@ class Setup_Colors final : public SetupTab, void updateGradType(); }; -#endif // SETUP_COLORS_H +#endif // GUI_SETUP_COLORS_H diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h index 69279ff7b..10fc2a32f 100644 --- a/src/gui/setup_input.h +++ b/src/gui/setup_input.h @@ -100,4 +100,4 @@ class Setup_Input final : public SetupTab int *mActionDataSize; }; -#endif +#endif // GUI_SETUP_INPUT_H diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index f5c90496a..3a54eb03d 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -59,4 +59,4 @@ class Setup_Joystick final : public SetupTab CheckBox *mUseInactiveCheckBox; }; -#endif +#endif // GUI_SETUP_JOYSTICK_H diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h index 315da1bcd..06a512abb 100644 --- a/src/gui/setup_other.h +++ b/src/gui/setup_other.h @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_SETYP_OTHER_H +#ifndef GUI_SETUP_OTHER_H #define GUI_SETUP_OTHER_H #include "gui/widgets/setupitem.h" @@ -48,4 +48,4 @@ class Setup_Other final : public SetupTabScroll NamesModel *mDensityList; }; -#endif +#endif // GUI_SETUP_OTHER_H diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h index 56468a257..f9777f1c1 100644 --- a/src/gui/setup_perfomance.h +++ b/src/gui/setup_perfomance.h @@ -42,4 +42,4 @@ class Setup_Perfomance final : public SetupTabScroll NamesModel *mTexturesList; }; -#endif +#endif // GUI_SETUP_PERFOMANCE_H diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index 8cad4a5a4..fdc2b7db5 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -36,4 +36,4 @@ class Setup_Players final : public SetupTabScroll A_DELETE_COPY(Setup_Players) }; -#endif +#endif // GUI_SETUP_PLAYERS_H diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index fb9b125f3..cac44c470 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -81,4 +81,4 @@ private: DropDown *mIgnoreActionChoicesBox; }; -#endif +#endif // GUI_SETUP_RELATIONS_H diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h index 9acfb0b1f..3470f1a2b 100644 --- a/src/gui/setup_theme.h +++ b/src/gui/setup_theme.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_Setup_Theme_H -#define GUI_Setup_Theme_H +#ifndef GUI_SETUP_THEME_H +#define GUI_SETUP_THEME_H #include "gui/widgets/setuptab.h" @@ -103,4 +103,4 @@ class Setup_Theme final : public SetupTab std::string mThemeInfo; }; -#endif +#endif // GUI_SETUP_THEME_H diff --git a/src/gui/setup_touch.h b/src/gui/setup_touch.h index bfb73b257..63ddb5dd2 100644 --- a/src/gui/setup_touch.h +++ b/src/gui/setup_touch.h @@ -41,4 +41,4 @@ class Setup_Touch final : public SetupTabScroll TouchActionsModel *mActionsList; }; -#endif +#endif // GUI_SETUP_TOUCH_H diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 86d60987a..bd77e32b5 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -81,4 +81,4 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener bool mNoFrame; }; -#endif +#endif // GUI_SETUP_VIDEO_H diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h index 191100d7c..e1492d028 100644 --- a/src/gui/setup_visual.h +++ b/src/gui/setup_visual.h @@ -45,4 +45,4 @@ class Setup_Visual final : public SetupTabScroll NamesModel *mVSyncList; }; -#endif +#endif // GUI_SETUP_VISUAL_H diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h index fb1df44bb..4b5b721e1 100644 --- a/src/gui/setupactiondata.h +++ b/src/gui/setupactiondata.h @@ -1881,4 +1881,4 @@ static SetupActionData *const touchActionData[] = setupActionData6 }; -#endif +#endif // GUI_SETUPACTIONDATA_H diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index e35a6cc90..2645f6d20 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SHOP_H -#define SHOP_H +#ifndef GUI_SHOPWINDOW_H +#define GUI_SHOPWINDOW_H #include "gui/widgets/window.h" @@ -176,4 +176,4 @@ class ShopWindow final : public Window, public gcn::ActionListener, extern ShopWindow *shopWindow; -#endif +#endif // GUI_SHOPWINDOW_H diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index 530a272e3..57e399f17 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SHORTCUTWINDOW_H -#define SHORTCUTWINDOW_H +#ifndef GUI_SHORTCUTWINDOW_H +#define GUI_SHORTCUTWINDOW_H #include "gui/widgets/window.h" @@ -83,4 +83,4 @@ extern ShortcutWindow *itemShortcutWindow; extern ShortcutWindow *emoteShortcutWindow; extern ShortcutWindow *dropShortcutWindow; -#endif +#endif // GUI_SHORTCUTWINDOW_H diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index ad3df5f8b..fd8728f2d 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SKILLDIALOG_H -#define SKILLDIALOG_H +#ifndef GUI_SKILLDIALOG_H +#define GUI_SKILLDIALOG_H #include "gui/widgets/window.h" @@ -105,4 +105,4 @@ class SkillDialog final : public Window, public gcn::ActionListener extern SkillDialog *skillDialog; -#endif +#endif // GUI_SKILLDIALOG_H diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index ac0caf3ca..33891c92a 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SOCIALWINDOW_H -#define SOCIALWINDOW_H +#ifndef GUI_SOCIALWINDOW_H +#define GUI_SOCIALWINDOW_H #include "gui/widgets/window.h" @@ -160,4 +160,4 @@ protected: extern SocialWindow *socialWindow; -#endif // SOCIALWINDOW_H +#endif // GUI_SOCIALWINDOW_H diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 19efd6017..ca3c9668b 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPEECHBUBBLE_H -#define SPEECHBUBBLE_H +#ifndef GUI_SPEECHBUBBLE_H +#define GUI_SPEECHBUBBLE_H #include "gui/theme.h" @@ -61,4 +61,4 @@ class SpeechBubble final : public Popup TextBox *mSpeechBox; }; -#endif +#endif // GUI_SPEECHBUBBLE_H diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h index 01a283dbc..35727f875 100644 --- a/src/gui/spellpopup.h +++ b/src/gui/spellpopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPELLPOPUP_H -#define SPELLPOPUP_H +#ifndef GUI_SPELLPOPUP_H +#define GUI_SPELLPOPUP_H #include "gui/widgets/popup.h" @@ -69,4 +69,4 @@ class SpellPopup final : public Popup Label *mItemComment; }; -#endif // SPELLPOPUP_H +#endif // GUI_SPELLPOPUP_H diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h index eff1b15c0..7ee98c32d 100644 --- a/src/gui/statuspopup.h +++ b/src/gui/statuspopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef StatusPopup_H -#define StatusPopup_H +#ifndef GUI_STATUSPOPUP_H +#define GUI_STATUSPOPUP_H #include "keydata.h" @@ -71,4 +71,4 @@ class StatusPopup final : public Popup Label *mLabels[STATUSPOPUP_NUM_LABELS]; }; -#endif // StatusPopup_H +#endif // GUI_STATUSPOPUP_H diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index c9c43b872..d7d465d10 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef STATUS_H -#define STATUS_H +#ifndef GUI_STATUSWINDOW_H +#define GUI_STATUSWINDOW_H #include "depricatedlistener.h" @@ -122,4 +122,4 @@ class StatusWindow final : public Window, extern StatusWindow *statusWindow; -#endif +#endif // GUI_STATUSWINDOW_H diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h index 3036c5d5f..c9308fe06 100644 --- a/src/gui/textcommandeditor.h +++ b/src/gui/textcommandeditor.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TEXTCOMMANDEDITOR_H -#define TEXTCOMMANDEDITOR_H +#ifndef GUI_TEXTCOMMANDEDITOR_H +#define GUI_TEXTCOMMANDEDITOR_H #include "gui/widgets/window.h" @@ -105,4 +105,4 @@ class TextCommandEditor final : public Window, public gcn::ActionListener bool mEnabledKeyboard; }; -#endif +#endif // GUI_TEXTCOMMANDEDITOR_H diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index fddf3947e..9f9292ef6 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_GUILD_DIALOG_H -#define GUI_GUILD_DIALOG_H +#ifndef GUI_TEXTDIALOG_H +#define GUI_TEXTDIALOG_H #include "gui/widgets/window.h" @@ -77,4 +77,4 @@ private: bool mEnabledKeyboard; }; -#endif +#endif // GUI_TEXTDIALOG_H diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 1bd9cecd3..7f4f4e123 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -32,7 +32,6 @@ #include "utils/gettext.h" -//#include <guichan/rectangle.hpp> #include <guichan/font.hpp> #include "debug.h" diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h index 2ac658d64..296cadb63 100644 --- a/src/gui/textpopup.h +++ b/src/gui/textpopup.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TEXTPOPUP_H -#define TEXTPOPUP_H +#ifndef GUI_TEXTPOPUP_H +#define GUI_TEXTPOPUP_H #include "gui/widgets/popup.h" @@ -79,4 +79,4 @@ class TextPopup final : public Popup Label *mText[TEXTPOPUPCOUNT]; }; -#endif // TEXTPOPUP_H +#endif // GUI_TEXTPOPUP_H diff --git a/src/gui/theme.h b/src/gui/theme.h index 231a32ce2..443150a0f 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -22,8 +22,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef THEME_H -#define THEME_H +#ifndef GUI_THEME_H +#define GUI_THEME_H #include "configlistener.h" #include "graphics.h" @@ -507,4 +507,4 @@ class Theme final : public Palette, public ConfigListener ProgressColors mProgressColors; }; -#endif +#endif // GUI_THEME_H diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h index eb5a2369b..b6158d4d7 100644 --- a/src/gui/tradewindow.h +++ b/src/gui/tradewindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TRADEWINDOW_H -#define TRADEWINDOW_H +#ifndef GUI_TRADEWINDOW_H +#define GUI_TRADEWINDOW_H #include "gui/widgets/window.h" @@ -185,4 +185,4 @@ class TradeWindow final : public Window, extern TradeWindow *tradeWindow; -#endif +#endif // GUI_TRADEWINDOW_H diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index c6a5b3309..6ae066ff5 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef UNREGISTERDIALOG_H -#define UNREGISTERDIALOG_H +#ifndef GUI_UNREGISTERDIALOG_H +#define GUI_UNREGISTERDIALOG_H #include "gui/widgets/window.h" @@ -68,4 +68,4 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener WrongDataNoticeListener *mWrongDataNoticeListener; }; -#endif +#endif // GUI_UNREGISTERDIALOG_H diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h index 3cc8392e5..440344367 100644 --- a/src/gui/updaterwindow.h +++ b/src/gui/updaterwindow.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef UPDATERWINDOW_H -#define UPDATERWINDOW_H +#ifndef GUI_UPDATERWINDOW_H +#define GUI_UPDATERWINDOW_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" @@ -253,4 +253,4 @@ private: std::string mUpdateServerPath; }; -#endif +#endif // GUI_UPDATERWINDOW_H diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 5446077a2..bb3a151ef 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef USER_PALETTE_H -#define USER_PALETTE_H +#ifndef GUI_USERPALETTE_H +#define GUI_USERPALETTE_H #include "gui/palette.h" @@ -232,4 +232,4 @@ class UserPalette final : public Palette, public gcn::ListModel extern UserPalette *userPalette; -#endif // USER_PALETTE_H +#endif // GUI_USERPALETTE_H diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 986ace245..28be67c2b 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef VIEWPORT_H -#define VIEWPORT_H +#ifndef GUI_VIEWPORT_H +#define GUI_VIEWPORT_H #include "configlistener.h" #include "maplayer.h" @@ -345,4 +345,4 @@ class Viewport final : public WindowContainer, extern Viewport *viewport; /**< The viewport. */ -#endif +#endif // GUI_VIEWPORT_H diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index 6b6acd694..5aba33776 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WHOISONLINE_H -#define WHOISONLINE_H +#ifndef GUI_WHOISONLINE_H +#define GUI_WHOISONLINE_H #include "configlistener.h" @@ -219,4 +219,4 @@ private: extern WhoIsOnline *whoIsOnline; -#endif +#endif // GUI_WHOISONLINE_H diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index 579651d29..36950f3ab 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_AVATARLISTBOX_H -#define GUI_AVATARLISTBOX_H +#ifndef GUI_WIDGETS_AVATARLISTBOX_H +#define GUI_WIDGETS_AVATARLISTBOX_H #include "avatar.h" @@ -71,4 +71,4 @@ private: static Image *offlineIcon; }; -#endif +#endif // GUI_WIDGETS_AVATARLISTBOX_H diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h index 83828f744..55b922f70 100644 --- a/src/gui/widgets/battletab.h +++ b/src/gui/widgets/battletab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BATTLETAB_H -#define BATTLETAB_H +#ifndef GUI_WIDGETS_BATTLETAB_H +#define GUI_WIDGETS_BATTLETAB_H #include "gui/widgets/chattab.h" @@ -44,4 +44,5 @@ class BattleTab final : public ChatTab }; extern BattleTab *battleChatTab; -#endif + +#endif // GUI_WIDGETS_BATTLETAB_H diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index e8975a40c..3fa8bf579 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BROWSERBOX_H -#define BROWSERBOX_H +#ifndef GUI_WIDGETS_BROWSERBOX_H +#define GUI_WIDGETS_BROWSERBOX_H #include "gui/widgets/widget2.h" @@ -273,4 +273,4 @@ class BrowserBox final : public gcn::Widget, static int mInstances; }; -#endif +#endif // GUI_WIDGETS_BROWSERBOX_H diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 2fa2d64ac..3509aeded 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BUTTON_H -#define BUTTON_H +#ifndef GUI_WIDGETS_BUTTON_H +#define GUI_WIDGETS_BUTTON_H #include "gui/widgets/widget2.h" @@ -168,4 +168,4 @@ class Button final : public gcn::Button, bool mPressed; }; -#endif +#endif // GUI_WIDGETS_BUTTON_H diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h index ed8a36031..2f8019e16 100644 --- a/src/gui/widgets/characterdisplay.h +++ b/src/gui/widgets/characterdisplay.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WIDGETS_CHARACTER_DISPLAY_H -#define WIDGETS_CHARACTER_DISPLAY_H +#ifndef GUI_WIDGETS_CHARACTERDISPLAY_H +#define GUI_WIDGETS_CHARACTERDISPLAY_H #include "gui/widgets/container.h" #include "gui/widgets/playerbox.h" @@ -90,4 +90,4 @@ class CharacterDisplay final : public Container, TextPopup *mPopup; }; -#endif +#endif // GUI_WIDGETS_CHARACTERDISPLAY_H diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h index 42e4025eb..0a179d619 100644 --- a/src/gui/widgets/characterviewbase.h +++ b/src/gui/widgets/characterviewbase.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WIDGETS_CHARACTERVIEWBASE_H -#define WIDGETS_CHARACTERVIEWBASE_H +#ifndef GUI_WIDGETS_CHARACTERVIEWBASE_H +#define GUI_WIDGETS_CHARACTERVIEWBASE_H #include "gui/charselectdialog.h" @@ -62,4 +62,4 @@ class CharacterViewBase : public Container, int mSelected; }; -#endif +#endif // GUI_WIDGETS_CHARACTERVIEWBASE_H diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h index ab45bee8a..f404223e6 100644 --- a/src/gui/widgets/characterviewnormal.h +++ b/src/gui/widgets/characterviewnormal.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WIDGETS_CHARACTERVIEWNORMAL_H -#define WIDGETS_CHARACTERVIEWNORMAL_H +#ifndef GUI_WIDGETS_CHARACTERVIEWNORMAL_H +#define GUI_WIDGETS_CHARACTERVIEWNORMAL_H #include "gui/widgets/characterviewbase.h" @@ -47,4 +47,4 @@ class CharacterViewNormal final : public CharacterViewBase std::vector<CharacterDisplay*> *mCharacterEntries; }; -#endif +#endif // GUI_WIDGETS_CHARACTERVIEWNORMAL_H diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h index f42500b79..2ad1f83d3 100644 --- a/src/gui/widgets/characterviewsmall.h +++ b/src/gui/widgets/characterviewsmall.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WIDGETS_CHARACTERVIEWSMALL_H -#define WIDGETS_CHARACTERVIEWSMALL_H +#ifndef GUI_WIDGETS_CHARACTERVIEWSMALL_H +#define GUI_WIDGETS_CHARACTERVIEWSMALL_H #include "gui/widgets/characterviewbase.h" @@ -51,4 +51,4 @@ class CharacterViewSmall final : public CharacterViewBase std::vector<CharacterDisplay*> *mCharacterEntries; }; -#endif +#endif // GUI_WIDGETS_CHARACTERVIEWSMALL_H diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 7f27615ae..7cec0c18d 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHATTAB_H -#define CHATTAB_H +#ifndef GUI_WIDGETS_CHATTAB_H +#define GUI_WIDGETS_CHATTAB_H #include "gui/chatwindow.h" @@ -209,4 +209,4 @@ class ChatTab : public Tab extern ChatTab *localChatTab; extern ChatTab *debugChatTab; -#endif // CHATTAB_H +#endif // GUI_WIDGETS_CHATTAB_H diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index c6701f52a..a18079bed 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHECKBOX_H -#define CHECKBOX_H +#ifndef GUI_WIDGETS_CHECKBOX_H +#define GUI_WIDGETS_CHECKBOX_H #include "gui/widgets/widget2.h" @@ -98,4 +98,4 @@ class CheckBox final : public gcn::CheckBox, static float mAlpha; }; -#endif +#endif // GUI_WIDGETS_CHECKBOX_H diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index 60da54672..8c1a0fec6 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_CONTAINER_H -#define GUI_CONTAINER_H +#ifndef GUI_WIDGETS_CONTAINER_H +#define GUI_WIDGETS_CONTAINER_H #include "gui/widgets/widget2.h" @@ -52,4 +52,4 @@ class Container : public gcn::Container, bool safeRemove(gcn::Widget *const widget); }; -#endif +#endif // GUI_WIDGETS_CONTAINER_H diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index d08127630..d0a853efb 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DESKTOP_H -#define DESKTOP_H +#ifndef GUI_WIDGETS_DESKTOP_H +#define GUI_WIDGETS_DESKTOP_H #include "gui/widgets/container.h" @@ -71,4 +71,4 @@ class Desktop final : public Container, private gcn::WidgetListener gcn::Color mBackgroundGrayColor; }; -#endif // DESKTOP_H +#endif // GUI_WIDGETS_DESKTOP_H diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index ae74e571d..4c6120dfa 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DROPDOWN_H -#define DROPDOWN_H +#ifndef GUI_WIDGETS_DROPDOWN_H +#define GUI_WIDGETS_DROPDOWN_H #include "gui/widgets/widget2.h" @@ -171,4 +171,4 @@ class DropDown final : public gcn::ActionListener, static Skin *mSkin; }; -#endif // end DROPDOWN_H +#endif // GUI_WIDGETS_DROPDOWN_H diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h index 62f52a858..c7dde87b9 100644 --- a/src/gui/widgets/dropshortcutcontainer.h +++ b/src/gui/widgets/dropshortcutcontainer.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DROPSHORTCUTCONTAINER_H -#define DROPSHORTCUTCONTAINER_H +#ifndef GUI_WIDGETS_DROPSHORTCUTCONTAINER_H +#define GUI_WIDGETS_DROPSHORTCUTCONTAINER_H #include <guichan/mouselistener.hpp> @@ -90,4 +90,4 @@ class DropShortcutContainer final : public ShortcutContainer gcn::Color mUnEquipedColor2; }; -#endif +#endif // GUI_WIDGETS_DROPSHORTCUTCONTAINER_H diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index f10d1b67f..3efd884a6 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EMOTESHORTCUTCONTAINER_H -#define EMOTESHORTCUTCONTAINER_H +#ifndef GUI_WIDGETS_EMOTESHORTCUTCONTAINER_H +#define GUI_WIDGETS_EMOTESHORTCUTCONTAINER_H #include "gui/widgets/shortcutcontainer.h" @@ -89,4 +89,4 @@ class EmoteShortcutContainer final : public ShortcutContainer unsigned char mEmoteMoved; }; -#endif +#endif // GUI_WIDGETS_EMOTESHORTCUTCONTAINER_H diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h index c5fca2e4c..1ac942a54 100644 --- a/src/gui/widgets/extendedlistbox.h +++ b/src/gui/widgets/extendedlistbox.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EXTENDEDLISTBOX_H -#define EXTENDEDLISTBOX_H +#ifndef GUI_WIDGETS_EXTENDEDLISTBOX_H +#define GUI_WIDGETS_EXTENDEDLISTBOX_H #include "gui/widgets/listbox.h" @@ -56,4 +56,4 @@ class ExtendedListBox final : public ListBox int mItemPadding; }; -#endif +#endif // GUI_WIDGETS_EXTENDEDLISTBOX_H diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/widgets/extendedlistmodel.h index c24382c5b..40decf9d3 100644 --- a/src/gui/widgets/extendedlistmodel.h +++ b/src/gui/widgets/extendedlistmodel.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EXTENDEDLISTMODEL_H -#define EXTENDEDLISTMODEL_H +#ifndef GUI_WIDGETS_EXTENDEDLISTMODEL_H +#define GUI_WIDGETS_EXTENDEDLISTMODEL_H #include "resources/image.h" @@ -31,4 +31,4 @@ class ExtendedListModel : public gcn::ListModel virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0; }; -#endif +#endif // GUI_WIDGETS_EXTENDEDLISTMODEL_H diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h index 0978f7302..3c08ef948 100644 --- a/src/gui/widgets/extendednamesmodel.h +++ b/src/gui/widgets/extendednamesmodel.h @@ -58,4 +58,4 @@ class ExtendedNamesModel : public ExtendedListModel std::vector<Image*> mImages; }; -#endif +#endif // GUI_WIDGETS_EXTENDEDNAMESMODEL_H diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index 45f493d9b..d9678ccd0 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FLOWCONTAINER_H -#define FLOWCONTAINER_H +#ifndef GUI_WIDGETS_FLOWCONTAINER_H +#define GUI_WIDGETS_FLOWCONTAINER_H #include "gui/widgets/container.h" @@ -71,4 +71,4 @@ class FlowContainer final : public Container, int mGridWidth, mGridHeight; }; -#endif +#endif // GUI_WIDGETS_FLOWCONTAINER_H diff --git a/src/gui/widgets/gmtab.h b/src/gui/widgets/gmtab.h index cadadca7e..c0a2ffdd8 100644 --- a/src/gui/widgets/gmtab.h +++ b/src/gui/widgets/gmtab.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GMTAB_H -#define GMTAB_H +#ifndef GUI_WIDGETS_GMTAB_H +#define GUI_WIDGETS_GMTAB_H #include "gui/widgets/chattab.h" @@ -50,4 +50,4 @@ class GmTab final : public ChatTab extern GmTab *gmChatTab; -#endif // GMTAB_H +#endif // GUI_WIDGETS_GMTAB_H diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h index 6daada229..1303d6f39 100644 --- a/src/gui/widgets/guildchattab.h +++ b/src/gui/widgets/guildchattab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_GUILDTAB_H -#define GUI_GUILDTAB_H +#ifndef GUI_WIDGETS_GUILDCHATTAB_H +#define GUI_WIDGETS_GUILDCHATTAB_H #include "gui/widgets/chattab.h" @@ -57,4 +57,4 @@ class GuildChatTab final : public ChatTab, public ConfigListener void getAutoCompleteList(StringVect &names) const override; }; -#endif +#endif // GUI_WIDGETS_GUILDCHATTAB_H diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 3dfc23f1c..37b44410b 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TABLE_H -#define TABLE_H +#ifndef GUI_WIDGETS_GUITABLE_H +#define GUI_WIDGETS_GUITABLE_H #include "localconsts.h" @@ -193,4 +193,4 @@ private: gcn::Color mHighlightColor; }; -#endif // TABLE_H +#endif // GUI_WIDGETS_GUITABLE_H diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index 486ba53db..c9b50a9b9 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_HORIZONTCONTAINER_H -#define GUI_HORIZONTCONTAINER_H +#ifndef GUI_WIDGETS_HORIZONTCONTAINER_H +#define GUI_WIDGETS_HORIZONTCONTAINER_H #include "gui/widgets/container.h" @@ -55,4 +55,4 @@ class HorizontContainer final : public Container, public gcn::WidgetListener int mLastX; }; -#endif +#endif // GUI_WIDGETS_HORIZONTCONTAINER_H diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index bae76bb72..a81fc8bc1 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ICON_H -#define ICON_H +#ifndef GUI_WIDGETS_ICON_H +#define GUI_WIDGETS_ICON_H #include "gui/widgets/widget2.h" @@ -74,4 +74,4 @@ class Icon final : public gcn::Widget, Image *mImage; }; -#endif // ICON_H +#endif // GUI_WIDGETS_ICON_H diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h index 415c2806e..8919885e5 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INTTEXTFIELD_H -#define INTTEXTFIELD_H +#ifndef GUI_WIDGETS_INTTEXTFIELD_H +#define GUI_WIDGETS_INTTEXTFIELD_H #include "gui/widgets/textfield.h" @@ -77,4 +77,4 @@ class IntTextField final : public TextField int mValue; /**< Current value */ }; -#endif +#endif // GUI_WIDGETS_INTTEXTFIELD_H diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 395f885eb..a422e654d 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEMCONTAINER_H -#define ITEMCONTAINER_H +#ifndef GUI_WIDGETS_ITEMCONTAINER_H +#define GUI_WIDGETS_ITEMCONTAINER_H #include "gui/widgets/widget2.h" @@ -227,4 +227,4 @@ class ItemContainer final : public gcn::Widget, gcn::Color mUnEquipedColor2; }; -#endif +#endif // GUI_WIDGETS_ITEMCONTAINER_H diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index 6d389b4b7..abeee0156 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEM_LINK_HANDLER_H -#define ITEM_LINK_HANDLER_H +#ifndef GUI_WIDGETS_ITEMLINKHANDLER_H +#define GUI_WIDGETS_ITEMLINKHANDLER_H #include "gui/widgets/linkhandler.h" @@ -45,4 +45,4 @@ class ItemLinkHandler final : public LinkHandler ItemPopup *mItemPopup; }; -#endif +#endif // GUI_WIDGETS_ITEMLINKHANDLER_H diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 97ad0db27..afd421b40 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEMSHORTCUTCONTAINER_H -#define ITEMSHORTCUTCONTAINER_H +#ifndef GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H +#define GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H #include "gui/widgets/shortcutcontainer.h" @@ -94,4 +94,4 @@ class ItemShortcutContainer final : public ShortcutContainer gcn::Color mForegroundColor2; }; -#endif +#endif // GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 39146ffd2..31d75b6ff 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LABEL_H -#define LABEL_H +#ifndef GUI_WIDGETS_LABEL_H +#define GUI_WIDGETS_LABEL_H #include "gui/widgets/widget2.h" @@ -76,4 +76,4 @@ class Label final : public gcn::Label, public Widget2 int mPadding; }; -#endif +#endif // GUI_WIDGETS_LABEL_H diff --git a/src/gui/widgets/langtab.h b/src/gui/widgets/langtab.h index 04c77cac2..c594981ad 100644 --- a/src/gui/widgets/langtab.h +++ b/src/gui/widgets/langtab.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LANGTAB_H -#define LANGTAB_H +#ifndef GUI_WIDGETS_LANGTAB_H +#define GUI_WIDGETS_LANGTAB_H #include "gui/widgets/chattab.h" @@ -39,4 +39,5 @@ class LangTab final : public ChatTab }; extern LangTab *langChatTab; -#endif + +#endif // GUI_WIDGETS_LANGTAB_H diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 7dbb61384..33930c69e 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WIDGET_LAYOUT_H -#define WIDGET_LAYOUT_H +#ifndef GUI_WIDGETS_LAYOUT_H +#define GUI_WIDGETS_LAYOUT_H #include "localconsts.h" @@ -363,4 +363,4 @@ class Layout final : public LayoutCell bool mComputed; }; -#endif // WIDGET_LAYOUT_H +#endif // GUI_WIDGETS_LAYOUT_H diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index fea4efdd6..9831abc28 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LAYOUTHELPER_H -#define LAYOUTHELPER_H +#ifndef GUI_WIDGETS_LAYOUTHELPER_H +#define GUI_WIDGETS_LAYOUTHELPER_H #include "gui/widgets/layout.h" @@ -85,4 +85,4 @@ class LayoutHelper final : public gcn::WidgetListener gcn::Container *mContainer; /**< Managed container */ }; -#endif // LAYOUTHELPER_H +#endif // GUI_WIDGETS_LAYOUTHELPER_H diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h index 7411facc3..1114f5a21 100644 --- a/src/gui/widgets/linkhandler.h +++ b/src/gui/widgets/linkhandler.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LINK_HANDLER_H -#define LINK_HANDLER_H +#ifndef GUI_WIDGETS_LINKHANDLER_H +#define GUI_WIDGETS_LINKHANDLER_H #include <string> @@ -41,4 +41,4 @@ class LinkHandler gcn::MouseEvent *event) = 0; }; -#endif +#endif // GUI_WIDGETS_LINKHANDLER_H diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index ea48c6f16..287090c92 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LISTBOX_H -#define LISTBOX_H +#ifndef GUI_WIDGETS_LISTBOX_H +#define GUI_WIDGETS_LISTBOX_H #include "gui/widgets/widget2.h" @@ -101,4 +101,4 @@ class ListBox : public gcn::ListBox, Skin *mSkin; }; -#endif +#endif // GUI_WIDGETS_LISTBOX_H diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h index 0d1a10096..fd3bb0ac8 100644 --- a/src/gui/widgets/mouseevent.h +++ b/src/gui/widgets/mouseevent.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_MOUSEEVENT_H -#define GUI_MOUSEEVENT_H +#ifndef GUI_WIDGETS_MOUSEEVENT_H +#define GUI_WIDGETS_MOUSEEVENT_H #include <guichan/mouseevent.hpp> #include <guichan/widget.hpp> @@ -45,4 +45,4 @@ class MouseEvent final : public gcn::MouseEvent { mY = n; } }; -#endif +#endif // GUI_WIDGETS_MOUSEEVENT_H diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h index 4a1754ef0..9bf024a9e 100644 --- a/src/gui/widgets/namesmodel.h +++ b/src/gui/widgets/namesmodel.h @@ -55,4 +55,4 @@ class NamesModel : public gcn::ListModel StringVect mNames; }; -#endif +#endif // GUI_WIDGETS_NAMESMODEL_H diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h index 46ed865f2..d605d7d38 100644 --- a/src/gui/widgets/passwordfield.h +++ b/src/gui/widgets/passwordfield.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PASSWORDFIELD_H -#define PASSWORDFIELD_H +#ifndef GUI_WIDGETS_PASSWORDFIELD_H +#define GUI_WIDGETS_PASSWORDFIELD_H #include "gui/widgets/textfield.h" @@ -50,4 +50,4 @@ class PasswordField final : public TextField int mPasswordChar; }; -#endif +#endif // GUI_WIDGETS_PASSWORDFIELD_H diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index f2b0a0616..7368bb2d7 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PLAYERBOX_H -#define PLAYERBOX_H +#ifndef GUI_WIDGETS_PLAYERBOX_H +#define GUI_WIDGETS_PLAYERBOX_H #include "gui/widgets/widget2.h" @@ -101,4 +101,4 @@ class PlayerBox final : public Widget2, bool mSelected; }; -#endif +#endif // GUI_WIDGETS_PLAYERBOX_H diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 57772f642..c5f8bd3c1 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -21,8 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef POPUP_H -#define POPUP_H +#ifndef GUI_WIDGETS_POPUP_H +#define GUI_WIDGETS_POPUP_H #include "configuration.h" #include "gui/widgets/container.h" @@ -186,4 +186,4 @@ class Popup : public Container, public gcn::MouseListener, bool mRedraw; }; -#endif +#endif // GUI_WIDGETS_POPUP_H diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h index 59e04df63..a9d2c7593 100644 --- a/src/gui/widgets/popuplist.h +++ b/src/gui/widgets/popuplist.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef POPUP_LIST_H -#define POPUP_LIST_H +#ifndef GUI_WIDGETS_POPUPLIST_H +#define GUI_WIDGETS_POPUPLIST_H #include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" @@ -75,4 +75,4 @@ class PopupList final : public Popup, bool mModal; }; -#endif +#endif // GUI_WIDGETS_POPUPLIST_H diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index c5486f294..c1cd2afb7 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROGRESSBAR_H -#define PROGRESSBAR_H +#ifndef GUI_WIDGETS_PROGRESSBAR_H +#define GUI_WIDGETS_PROGRESSBAR_H #include "gui/widgets/widget2.h" @@ -161,4 +161,4 @@ class ProgressBar final : public gcn::Widget, static const gcn::Color TEXT_COLOR; }; -#endif +#endif // GUI_WIDGETS_PROGRESSBAR_H diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index da80f59ec..66f6c8a0e 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROGRESSINDICATOR_H -#define PROGRESSINDICATOR_H +#ifndef GUI_WIDGETS_PROGRESSINDICATOR_H +#define GUI_WIDGETS_PROGRESSINDICATOR_H #include "gui/widgets/widget2.h" @@ -52,4 +52,4 @@ class ProgressIndicator final : public gcn::Widget, SimpleAnimation *mIndicator; }; -#endif // PROGRESSINDICATOR_H +#endif // GUI_WIDGETS_PROGRESSINDICATOR_H diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index 50372e8c2..01bbb438e 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RADIOBUTTON_H -#define RADIOBUTTON_H +#ifndef GUI_WIDGETS_RADIOBUTTON_H +#define GUI_WIDGETS_RADIOBUTTON_H #include "gui/widgets/widget2.h" @@ -91,4 +91,4 @@ class RadioButton final : public gcn::RadioButton, gcn::Color mForegroundColor2; }; -#endif // RADIOBUTTON_H +#endif // GUI_WIDGETS_RADIOBUTTON_H diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h index db2cd6dbb..60348e4ac 100644 --- a/src/gui/widgets/radiogroup.h +++ b/src/gui/widgets/radiogroup.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_RADIOGROUP_H -#define GUI_RADIOGROUP_H +#ifndef GUI_WIDGETS_RADIOGROUP_H +#define GUI_WIDGETS_RADIOGROUP_H #include "gui/widgets/widgetgroup.h" @@ -38,4 +38,4 @@ class RadioGroup final : public WidgetGroup override A_WARN_UNUSED; }; -#endif +#endif // GUI_WIDGETS_RADIOGROUP_H diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 6772e9e0c..6455d1af8 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SCROLLAREA_H -#define SCROLLAREA_H +#ifndef GUI_WIDGETS_SCROLLAREA_H +#define GUI_WIDGETS_SCROLLAREA_H #include "gui/widgets/widget2.h" @@ -196,4 +196,4 @@ class ScrollArea final : public gcn::ScrollArea, int mDrawHeight; }; -#endif +#endif // GUI_WIDGETS_SCROLLAREA_H diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index d91f0ac2e..2acf8a422 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SETUPITEM_H -#define SETUPITEM_H +#ifndef GUI_WIDGETS_SETUPITEM_H +#define GUI_WIDGETS_SETUPITEM_H #include "gui/widgets/tabbedarea.h" @@ -456,4 +456,4 @@ class SetupItemSound final : public SetupItemSliderList Button *mButton; }; -#endif +#endif // GUI_WIDGETS_SETUPITEM_H diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h index a388daf82..8e656234f 100644 --- a/src/gui/widgets/setuptab.h +++ b/src/gui/widgets/setuptab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_SETUPTAB_H -#define GUI_SETUPTAB_H +#ifndef GUI_WIDGETS_SETUPTAB_H +#define GUI_WIDGETS_SETUPTAB_H #include "gui/widgets/container.h" @@ -71,4 +71,4 @@ class SetupTab : public Container, std::string mName; }; -#endif +#endif // GUI_WIDGETS_SETUPTAB_H diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h index e177ba6cb..6e73e7a70 100644 --- a/src/gui/widgets/setuptabscroll.h +++ b/src/gui/widgets/setuptabscroll.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_SETUPTABSCROLL_H -#define GUI_SETUPTABSCROLL_H +#ifndef GUI_WIDGETS_SETUPTABSCROLL_H +#define GUI_WIDGETS_SETUPTABSCROLL_H #include "gui/widgets/setuptab.h" @@ -72,4 +72,4 @@ class SetupTabScroll : public SetupTab int mPreferredFirstItemSize; }; -#endif +#endif // GUI_WIDGETS_SETUPTABSCROLL_H diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h index 72c0cba0c..ac9264467 100644 --- a/src/gui/widgets/setuptouchitem.h +++ b/src/gui/widgets/setuptouchitem.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SETUPTOUCHITEM_H -#define SETUPTOUCHITEM_H +#ifndef GUI_WIDGETS_SETUPTOUCHITEM_H +#define GUI_WIDGETS_SETUPTOUCHITEM_H #include "gui/setupactiondata.h" @@ -81,4 +81,4 @@ class SetupActionDropDown final : public SetupItem int mWidth; }; -#endif +#endif // GUI_WIDGETS_SETUPTOUCHITEM_H diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index e577916a2..c3ce2ff4b 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SHOPITEMS_H -#define SHOPITEMS_H +#ifndef GUI_WIDGETS_SHOPITEMS_H +#define GUI_WIDGETS_SHOPITEMS_H #include <guichan/listmodel.hpp> @@ -138,4 +138,4 @@ class ShopItems final : public gcn::ListModel bool mMergeDuplicates; }; -#endif // SHOPITEMS_H +#endif // GUI_WIDGETS_SHOPITEMS_H diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index 5bc63ca85..3f2cc6a27 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SHOPLISTBOX_H -#define SHOPLISTBOX_H +#ifndef GUI_WIDGETS_SHOPLISTBOX_H +#define GUI_WIDGETS_SHOPLISTBOX_H #include "gui/widgets/listbox.h" @@ -106,4 +106,4 @@ class ShopListBox final : public ListBox static float mAlpha; }; -#endif // SHOPLISTBOX_H +#endif // GUI_WIDGETS_SHOPLISTBOX_H diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 5872f765d..176c1837c 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SHORTCUTCONTAINER_H -#define SHORTCUTCONTAINER_H +#ifndef GUI_WIDGETS_SHORTCUTCONTAINER_H +#define GUI_WIDGETS_SHORTCUTCONTAINER_H #include "gui/widgets/tab.h" @@ -120,4 +120,4 @@ class ShortcutContainer : public gcn::Widget, bool mRedraw; }; -#endif +#endif // GUI_WIDGETS_SHORTCUTCONTAINER_H diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h index 63a73abed..bef377e9e 100644 --- a/src/gui/widgets/skilldata.h +++ b/src/gui/widgets/skilldata.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SKILLDATA_H -#define SKILLDATA_H +#ifndef GUI_WIDGETS_SKILLDATA_H +#define GUI_WIDGETS_SKILLDATA_H #include "gui/theme.h" @@ -47,4 +47,4 @@ struct SkillData final void setIcon(const std::string &iconPath); }; -#endif +#endif // GUI_WIDGETS_SKILLDATA_H diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index 21c310ea1..cfc55d053 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SKILLINFO_H -#define SKILLINFO_H +#ifndef GUI_WIDGETS_SKILLINFO_H +#define GUI_WIDGETS_SKILLINFO_H #include "gui/widgets/skilldata.h" @@ -65,4 +65,4 @@ struct SkillInfo final typedef std::vector<SkillInfo*> SkillList; typedef SkillList::iterator SkillListIter; -#endif +#endif // GUI_WIDGETS_SKILLINFO_H diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h index 7bd113a18..da5779672 100644 --- a/src/gui/widgets/skillmodel.h +++ b/src/gui/widgets/skillmodel.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SKILLMODEL_H -#define SKILLMODEL_H +#ifndef GUI_WIDGETS_SKILLMODEL_H +#define GUI_WIDGETS_SKILLMODEL_H #include "configuration.h" #include "effectmanager.h" @@ -83,4 +83,4 @@ class SkillModel final : public gcn::ListModel SkillList mVisibleSkills; }; -#endif +#endif // GUI_WIDGETS_SKILLMODEL_H diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index f1cc5b1b0..0adb05291 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SLIDER_H -#define SLIDER_H +#ifndef GUI_WIDGETS_SLIDER_H +#define GUI_WIDGETS_SLIDER_H #include "gui/widgets/widget2.h" @@ -110,4 +110,4 @@ class Slider final : public gcn::Slider, static int mInstances; }; -#endif +#endif // GUI_WIDGETS_SLIDER_H diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h index 4a0a9b351..f9394b3d6 100644 --- a/src/gui/widgets/sliderlist.h +++ b/src/gui/widgets/sliderlist.h @@ -83,4 +83,4 @@ class SliderList final : public Container, int mSelectedIndex; }; -#endif // end GUI_WIDGETS_SLIDERLIST_H +#endif // GUI_WIDGETS_SLIDERLIST_H diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index 81d6d5d73..de1572d1a 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPELLSHORTCUTCONTAINER_H -#define SPELLSHORTCUTCONTAINER_H +#ifndef GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H +#define GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H #include <guichan/mouselistener.hpp> @@ -87,4 +87,4 @@ class SpellShortcutContainer final : public ShortcutContainer bool mSpellClicked; }; -#endif +#endif // GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index 40f47f6ff..6cd2a3e2d 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TAB_H -#define TAB_H +#ifndef GUI_WIDGETS_TAB_H +#define GUI_WIDGETS_TAB_H #include "gui/widgets/widget2.h" @@ -181,4 +181,4 @@ class Tab : public gcn::BasicContainer, int mMode; }; -#endif +#endif // GUI_WIDGETS_TAB_H diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 40c60bd49..b30b9cb85 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TABBEDAREA_H -#define TABBEDAREA_H +#ifndef GUI_WIDGETS_TABBEDAREA_H +#define GUI_WIDGETS_TABBEDAREA_H #include "gui/widgets/widget2.h" @@ -239,4 +239,4 @@ class TabbedArea final : public Widget2, bool mBlockSwitching; }; -#endif +#endif // GUI_WIDGETS_TABBEDAREA_H diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h index dace35a14..dccce65ad 100644 --- a/src/gui/widgets/tablemodel.h +++ b/src/gui/widgets/tablemodel.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TABLE_MODEL_H -#define TABLE_MODEL_H +#ifndef GUI_WIDGETS_TABLEMODEL_H +#define GUI_WIDGETS_TABLEMODEL_H #include <set> #include <vector> @@ -163,4 +163,4 @@ protected: std::vector<int> mWidths; }; -#endif // TABLE_MODEL_H +#endif // GUI_WIDGETS_TABLEMODEL_H diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h index f6852df23..a61dab42b 100644 --- a/src/gui/widgets/tabstrip.h +++ b/src/gui/widgets/tabstrip.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_TABSTRIP_H -#define GUI_TABSTRIP_H +#ifndef GUI_WIDGETS_TABSTRIP_H +#define GUI_WIDGETS_TABSTRIP_H #include "gui/widgets/widgetgroup.h" @@ -44,4 +44,4 @@ class TabStrip final : public WidgetGroup void action(const gcn::ActionEvent &event) override; }; -#endif +#endif // GUI_WIDGETS_TABSTRIP_H diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 327a7a900..669ae6515 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TEXTBOX_H -#define TEXTBOX_H +#ifndef GUI_WIDGETS_TEXTBOX_H +#define GUI_WIDGETS_TEXTBOX_H #include "gui/widgets/widget2.h" @@ -73,4 +73,4 @@ class TextBox final : public gcn::TextBox, int mMinWidth; }; -#endif +#endif // GUI_WIDGETS_TEXTBOX_H diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 0569d5d30..d26d16d21 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TEXTFIELD_H -#define TEXTFIELD_H +#ifndef GUI_WIDGETS_TEXTFIELD_H +#define GUI_WIDGETS_TEXTFIELD_H #include "gui/widgets/widget2.h" @@ -154,4 +154,4 @@ class TextField : public gcn::TextField, PopupMenu *mPopupMenu; }; -#endif +#endif // GUI_WIDGETS_TEXTFIELD_H diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index 782fcc2e0..59f14bb9a 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TEXTPREVIEW_H -#define TEXTPREVIEW_H +#ifndef GUI_WIDGETS_TEXTPREVIEW_H +#define GUI_WIDGETS_TEXTPREVIEW_H #include "gui/widgets/widget2.h" @@ -141,4 +141,4 @@ class TextPreview final : public gcn::Widget, static Skin *mSkin; }; -#endif +#endif // GUI_WIDGETS_TEXTPREVIEW_H diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h index c790a42bb..e7fe67bf3 100644 --- a/src/gui/widgets/tradetab.h +++ b/src/gui/widgets/tradetab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TRADETAB_H -#define TRADETAB_H +#ifndef GUI_WIDGETS_TRADETAB_H +#define GUI_WIDGETS_TRADETAB_H #include "gui/widgets/chattab.h" @@ -47,4 +47,5 @@ class TradeTab final : public ChatTab }; extern TradeTab *tradeChatTab; -#endif + +#endif // GUI_WIDGETS_TRADETAB_H diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 4399504f2..a03df0f8f 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_VERTCONTAINER_H -#define GUI_VERTCONTAINER_H +#ifndef GUI_WIDGETS_VERTCONTAINER_H +#define GUI_WIDGETS_VERTCONTAINER_H #include "gui/widgets/container.h" @@ -63,4 +63,4 @@ class VertContainer final : public Container, public gcn::WidgetListener bool mResizable; }; -#endif +#endif // GUI_WIDGETS_VERTCONTAINER_H diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h index 5bc9fe2c2..9bfc1ce20 100644 --- a/src/gui/widgets/whispertab.h +++ b/src/gui/widgets/whispertab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WHISPERTAB_H -#define WHISPERTAB_H +#ifndef GUI_WIDGETS_WHISPERTAB_H +#define GUI_WIDGETS_WHISPERTAB_H #include "gui/widgets/chattab.h" @@ -73,4 +73,4 @@ class WhisperTab final : public ChatTab std::string mNick; }; -#endif // CHANNELTAB_H +#endif // GUI_WIDGETS_WHISPERTAB_H diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h index d657567ad..94cc7760e 100644 --- a/src/gui/widgets/widget2.h +++ b/src/gui/widgets/widget2.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGET2_H -#define GUI_WIDGET2_H +#ifndef GUI_WIDGETS_WIDGET2_H +#define GUI_WIDGETS_WIDGET2_H #include "gui/theme.h" @@ -95,4 +95,5 @@ class Widget2 }; extern int openGLMode; -#endif + +#endif // GUI_WIDGETS_WIDGET2_H diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index 9c59cc9c0..a247f0bb8 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETGROUP_H -#define GUI_WIDGETGROUP_H +#ifndef GUI_WIDGETS_WIDGETGROUP_H +#define GUI_WIDGETS_WIDGETGROUP_H #include "gui/widgets/container.h" @@ -64,4 +64,4 @@ class WidgetGroup : public Container, int mLastX; }; -#endif +#endif // GUI_WIDGETS_WIDGETGROUP_H diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 8ff32d273..3bea54bbb 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WINDOW_H -#define WINDOW_H +#ifndef GUI_WIDGETS_WINDOW_H +#define GUI_WIDGETS_WINDOW_H #include "graphics.h" #include "localconsts.h" @@ -507,4 +507,4 @@ class Window : public gcn::Window, gcn::Font *mCaptionFont; }; -#endif +#endif // GUI_WIDGETS_WINDOW_H diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h index 27fc065fe..3645b94b6 100644 --- a/src/gui/widgets/windowcontainer.h +++ b/src/gui/widgets/windowcontainer.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WINDOWCONTAINER_H -#define WINDOWCONTAINER_H +#ifndef GUI_WIDGETS_WINDOWCONTAINER_H +#define GUI_WIDGETS_WINDOWCONTAINER_H #include "gui/widgets/container.h" @@ -68,4 +68,4 @@ class WindowContainer : public Container extern WindowContainer *windowContainer; -#endif +#endif // GUI_WIDGETS_WINDOWCONTAINER_H diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index e32830c20..3a438e735 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WINDOWMENU_H -#define WINDOWMENU_H +#ifndef GUI_WINDOWMENU_H +#define GUI_WINDOWMENU_H #include "configlistener.h" @@ -138,4 +138,4 @@ class WindowMenu final : public Container, extern WindowMenu *windowMenu; -#endif +#endif // GUI_WINDOWMENU_H diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index 1e7f09771..bb3cd173b 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef WORLD_SELECT_DIALOG_H -#define WORLD_SELECT_DIALOG_H +#ifndef GUI_WORLDSELECTDIALOG_H +#define GUI_WORLDSELECTDIALOG_H #include "gui/widgets/window.h" @@ -75,4 +75,4 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener, Button *mChooseWorld; }; -#endif // WORLD_SELECT_DIALOG_H +#endif // GUI_WORLDSELECTDIALOG_H |