From de5b0753bd94e014f0e81fc676b21c251aabd326 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 15 Jun 2015 23:21:52 +0300 Subject: Fix code style. --- src/actions/statusbar.cpp | 1 + src/being/being.cpp | 5 +++-- src/being/playerrelations.cpp | 1 + src/being/playerrelations.h | 3 ++- src/gui/models/playerrelationlistmodel.h | 1 + src/gui/models/playertablemodel.h | 2 ++ src/gui/popups/popupmenu.cpp | 1 + src/gui/widgets/button.cpp | 15 ++++++++++----- src/gui/widgets/tabs/tab.h | 2 +- src/gui/widgets/window.h | 2 +- src/gui/windows/skilldialog.cpp | 1 - src/gui/windows/socialwindow.cpp | 1 - src/net/ea/beinghandler.cpp | 1 + src/net/ea/tradehandler.cpp | 1 + src/net/eathena/charserverhandler.cpp | 2 +- src/net/eathena/chathandler.cpp | 1 + src/net/eathena/protocol.h | 4 ++-- src/net/tmwa/chathandler.cpp | 1 + src/net/tmwa/protocol.h | 4 ++-- src/net/tmwa/tradehandler.cpp | 1 + 20 files changed, 33 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp index a072cb37c..971bfd0f6 100644 --- a/src/actions/statusbar.cpp +++ b/src/actions/statusbar.cpp @@ -26,6 +26,7 @@ #include "actions/actiondef.h" #include "being/localplayer.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/viewport.h" diff --git a/src/being/being.cpp b/src/being/being.cpp index 8be720f13..bf17a2a23 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2107,8 +2107,9 @@ void Being::updateColors() { mNameColor = &userPalette->getColor(UserColorId::DISREGARDED); } - else if (player_relations.getRelation(mName) == Relation::IGNORED - || player_relations.getRelation(mName) == Relation::ENEMY2) + else if (player_relations.getRelation(mName) + == Relation::IGNORED || + player_relations.getRelation(mName)== Relation::ENEMY2) { mNameColor = &userPalette->getColor(UserColorId::IGNORED); } diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 2ebaf3f2f..bdb7c08c2 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -28,6 +28,7 @@ #include "being/localplayer.h" #include "being/playerignorestrategy.h" +#include "being/playerrelation.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h index 5f7e6e2a4..62244c5ea 100644 --- a/src/being/playerrelations.h +++ b/src/being/playerrelations.h @@ -25,7 +25,7 @@ #include "utils/stringvector.h" -#include "being/playerrelation.h" +#include "enums/being/relation.h" #include #include @@ -34,6 +34,7 @@ class Being; class PlayerIgnoreStrategy; +class PlayerRelation; class PlayerRelationsListener; /** diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h index 32c29f0d3..f969b8e20 100644 --- a/src/gui/models/playerrelationlistmodel.h +++ b/src/gui/models/playerrelationlistmodel.h @@ -23,6 +23,7 @@ #ifndef GUI_MODELS_PLAYERRELATIONLISTMODEL_H #define GUI_MODELS_PLAYERRELATIONLISTMODEL_H +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/models/listmodel.h" diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h index 6525a38b3..de21224b8 100644 --- a/src/gui/models/playertablemodel.h +++ b/src/gui/models/playertablemodel.h @@ -27,6 +27,8 @@ #include "gui/models/tablemodel.h" +#include "being/playerrelation.h" + #include "localconsts.h" class PlayerRelationListModel; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 3686b29cd..f136e5bd5 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -31,6 +31,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "input/inputmanager.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 98140e71c..634e47ce2 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -111,7 +111,8 @@ Button::Button(const Widget2 *const widget) : mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -154,7 +155,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -203,7 +205,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -252,7 +255,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), @@ -301,7 +305,8 @@ Button::Button(const Widget2 *const widget, mDisabledColor(getThemeColor(ThemeColorId::BUTTON_DISABLED)), mDisabledColor2(getThemeColor(ThemeColorId::BUTTON_DISABLED_OUTLINE)), mHighlightedColor(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED)), - mHighlightedColor2(getThemeColor(ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), + mHighlightedColor2(getThemeColor( + ThemeColorId::BUTTON_HIGHLIGHTED_OUTLINE)), mPressedColor(getThemeColor(ThemeColorId::BUTTON_PRESSED)), mPressedColor2(getThemeColor(ThemeColorId::BUTTON_PRESSED_OUTLINE)), mImages(nullptr), diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 69cb7cf95..65ebc57b7 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -122,7 +122,7 @@ class Tab notfinal : public BasicContainer, mTabColor = color1; mTabOutlineColor = color2; mRedraw = true; - } + } /** * Set the highlighted color for the tab's text. diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 84931b88d..e062de671 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -289,7 +289,7 @@ class Window notfinal : public BasicContainer2, void setSaveVisible(const bool save) { mSaveVisible = save; } - virtual void postInit() override + void postInit() override { mInit = true; } /** diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 8b635b869..7f2d81740 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -34,7 +34,6 @@ #include "gui/windows/shortcutwindow.h" #include "gui/widgets/button.h" -#include "gui/widgets/createwidget.h" #include "gui/widgets/label.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 24fd1434c..f9827c35a 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -25,7 +25,6 @@ #include "gui/windows/setupwindow.h" #include "gui/widgets/button.h" -#include "gui/widgets/createwidget.h" #include "gui/widgets/label.h" #include "gui/widgets/tabbedarea.h" diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 515deeee7..0c4a83b42 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -27,6 +27,7 @@ #include "party.h" #include "being/localplayer.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/viewport.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 848e0a024..c27dba4f4 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -25,6 +25,7 @@ #include "notifymanager.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "gui/windows/tradewindow.h" diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 692ea5dfb..58e302c8a 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -33,13 +33,13 @@ #include "gui/widgets/createwidget.h" #include "net/character.h" +#include "net/playerhandler.h" #include "net/serverfeatures.h" #include "net/eathena/gamehandler.h" #include "net/eathena/loginhandler.h" #include "net/eathena/messageout.h" #include "net/eathena/network.h" -#include "net/eathena/playerhandler.h" #include "net/eathena/protocol.h" #include "net/eathena/sprite.h" diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index db7bb5829..712e66f86 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -27,6 +27,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/chatconsts.h" diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index e977477df..faef51ac2 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -68,7 +68,7 @@ packet(SMSG_MAP_LOGIN_SUCCESS, 0x0a18); /**< Contains starting location */ packet(SMSG_MAP_AUTH_REFUSE, 0x0074); packet(SMSG_MAP_QUIT_RESPONSE, 0x018b); packet(SMSG_PLAYER_STOP, 0x0088); /**< Stop walking, set position */ -packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); /**< Move to within attack range */ +packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); packet(SMSG_PLAYER_STAT_UPDATE_1, 0x00b0); packet(SMSG_PLAYER_STAT_UPDATE_2, 0x00b1); packet(SMSG_PLAYER_STAT_UPDATE_3, 0x0141); @@ -77,7 +77,7 @@ packet(SMSG_PLAYER_STAT_UPDATE_5, 0x00bd); packet(SMSG_PLAYER_STAT_UPDATE_6, 0x00be); packet(SMSG_PLAYER_GET_EXP, 0x07f6); packet(SMSG_WHO_ANSWER, 0x00c2); -packet(SMSG_PLAYER_WARP, 0x0091); /**< Warp player to map/location */ +packet(SMSG_PLAYER_WARP, 0x0091); packet(SMSG_PLAYER_INVENTORY, 0x0991); packet(SMSG_PLAYER_INVENTORY_ADD, 0x0990); packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af); diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 70ee87049..152a31bd8 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "being/localplayer.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/chatconsts.h" diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 70ad201d3..9a455e03a 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -63,7 +63,7 @@ packet(SMSG_PLAYER_UPDATE_1, 0x01d8); packet(SMSG_PLAYER_UPDATE_2, 0x01d9); packet(SMSG_PLAYER_MOVE, 0x01da); /**< A nearby player moves */ packet(SMSG_PLAYER_STOP, 0x0088); /**< Stop walking, set position */ -packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); /**< Move to within attack range */ +packet(SMSG_PLAYER_MOVE_TO_ATTACK, 0x0139); packet(SMSG_PLAYER_STAT_UPDATE_1, 0x00b0); packet(SMSG_PLAYER_STAT_UPDATE_2, 0x00b1); packet(SMSG_PLAYER_STAT_UPDATE_3, 0x0141); @@ -71,7 +71,7 @@ packet(SMSG_PLAYER_STAT_UPDATE_4, 0x00bc); packet(SMSG_PLAYER_STAT_UPDATE_5, 0x00bd); packet(SMSG_PLAYER_STAT_UPDATE_6, 0x00be); packet(SMSG_WHO_ANSWER, 0x00c2); -packet(SMSG_PLAYER_WARP, 0x0091); /**< Warp player to map/location */ +packet(SMSG_PLAYER_WARP, 0x0091); packet(SMSG_PLAYER_INVENTORY, 0x01ee); packet(SMSG_PLAYER_INVENTORY_ADD, 0x00a0); packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af); diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 4ad803640..f43c5b266 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -27,6 +27,7 @@ #include "notifymanager.h" #include "being/playerinfo.h" +#include "being/playerrelation.h" #include "being/playerrelations.h" #include "gui/windows/confirmdialog.h" -- cgit v1.2.3-60-g2f50