From 38be14fed30a1058e7ab91a6d2ec6ce0dd3c6ce1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 14 Aug 2015 20:48:54 +0300 Subject: fix code style. --- src/dyetool/client.h | 1 - src/gui/widgets/tabbedarea.cpp | 1 + src/gui/windowmanager_unittest.cc | 5 ----- src/net/eathena/beinghandler.cpp | 5 +---- src/net/eathena/protocol.h | 12 ++++++------ 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/dyetool/client.h b/src/dyetool/client.h index 860df5cf2..3e1b64691 100644 --- a/src/dyetool/client.h +++ b/src/dyetool/client.h @@ -36,7 +36,6 @@ #include "localconsts.h" class Button; -class Desktop; class Skin; class Window; diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 33f07efe8..cdc813fd3 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -81,6 +81,7 @@ TabbedArea::TabbedArea(const Widget2 *const widget) : KeyListener(), MouseListener(), WidgetListener(), + mArrowButton(), mSelectedTab(nullptr), mTabContainer(new BasicContainer2(widget)), mWidgetContainer(new BasicContainer2(widget)), diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 87f6bf47c..aa8591184 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -25,11 +25,8 @@ #include "settings.h" #include "gui/gui.h" -#include "gui/theme.h" #include "gui/userpalette.h" -#include "gui/fonts/font.h" - #include "gui/popups/beingpopup.h" #include "gui/popups/itempopup.h" #include "gui/popups/popupmenu.h" @@ -59,8 +56,6 @@ #include "utils/gettext.h" #include "utils/physfstools.h" -#include "net/logindata.h" - #include "debug.h" TEST_CASE("Windows tests", "windowmanager") diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 492d1894e..35d549149 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -28,9 +28,7 @@ #include "notifymanager.h" #include "party.h" -#include "being/localplayer.h" #include "being/mercenaryinfo.h" -#include "being/playerinfo.h" #include "enums/resources/notifytypes.h" @@ -38,7 +36,6 @@ #include "input/keyboardconfig.h" -#include "gui/windows/charselectdialog.h" #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" #include "gui/windows/outfitwindow.h" @@ -537,7 +534,7 @@ void BeingHandler::processBeingChangeLookCards(Net::MessageIn &msg) Net::Characters &chars = Net::CharServerHandler::mCharacters; const BeingId id = msg.readBeingId("being id"); - FOR_EACH(Net::Characters::iterator, it, chars) + FOR_EACH (Net::Characters::iterator, it, chars) { Net::Character *character = *it; if (character->dummy && character->dummy->getId() == id) diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 79910fa95..d3f0b3cb2 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -160,7 +160,7 @@ packet(SMSG_BEING_SPECIAL_EFFECT, 0x01f3); packet(SMSG_BEING_SPECIAL_EFFECT_NUM, 0x0284); packet(SMSG_BEING_SOUND_EFFECT, 0x01d3); packet(SMSG_BEING_EMOTION, 0x00c0); -packet(SMSG_BEING_ACTION, 0x008a); /**< Attack, sit, stand up, ... */ +packet(SMSG_BEING_ACTION, 0x008a); /**< Attack, sit, stand up, ...*/ packet(SMSG_BEING_ACTION2, 0x02e1); packet(SMSG_BEING_CHAT, 0x008d); /**< A being talks */ packet(SMSG_BEING_SLIDE, 0x01ff); @@ -264,14 +264,14 @@ packet(SMSG_PARTY_MEMBER_INFO, 0x01e9); packet(SMSG_PARTY_ITEM_PICKUP, 0x02b8); packet(SMSG_PARTY_LEADER, 0x07fc); -packet(SMSG_PLAYER_STORAGE_ITEMS, 0x0995); /**< Item list for storage */ -packet(SMSG_PLAYER_STORAGE_EQUIP, 0x0996); /**< Equipment list for storage */ -packet(SMSG_PLAYER_STORAGE_STATUS, 0x00f2); /**< Slots used and total slots */ +packet(SMSG_PLAYER_STORAGE_ITEMS, 0x0995); /* Item list for storage */ +packet(SMSG_PLAYER_STORAGE_EQUIP, 0x0996); /* Equipment list for storage */ +packet(SMSG_PLAYER_STORAGE_STATUS, 0x00f2); /* Slots used and total slots */ packet(SMSG_PLAYER_STORAGE_ADD_OUTDATED, 0x00f4); -packet(SMSG_PLAYER_STORAGE_ADD, 0x01c4); /**< Add item/equip to storage */ +packet(SMSG_PLAYER_STORAGE_ADD, 0x01c4); /* Add item/equip to storage */ // Remove item/equip from storage packet(SMSG_PLAYER_STORAGE_REMOVE, 0x00f6); -packet(SMSG_PLAYER_STORAGE_CLOSE, 0x00f8); /**< Storage access closed */ +packet(SMSG_PLAYER_STORAGE_CLOSE, 0x00f8); /* Storage access closed */ packet(SMSG_PLAYER_STORAGE_PASSWORD, 0x023a); packet(SMSG_PLAYER_STORAGE_PASSWORD_RESULT, 0x023c); -- cgit v1.2.3-60-g2f50