From 4dbb3e75160e465dbcdb6de282d2e4ad8f89bdc0 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Tue, 29 Apr 2008 08:46:00 +0000 Subject: Name structs with capital, just like classes. --- ChangeLog | 9 +++++++-- src/gui/changeemaildialog.h | 4 ++-- src/localplayer.cpp | 4 ++-- src/localplayer.h | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b864ae01..5e6544b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2008-04-29 Bjørn Lindeijer + + * src/localplayer.cpp, src/gui/changeemaildialog.h, src/localplayer.h: + Name structs with capital, just like classes. + 2008-04-28 David Athay - * src/gui/partywindow.h, src/gui/partywindow.cpp, - src/net/partyhandler.cpp, src/net/protocol.h, + * src/gui/partywindow.h, src/gui/partywindow.cpp, + src/net/partyhandler.cpp, src/net/protocol.h, src/net/chatserver/party.cpp, tmw.cbp: Added party invite dialog. * src/localplayer.cpp, src/localplayer.h, src/gui/skills.cpp, src/gui/skills.h: Skills patch by roderic, mantis id=209. diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index 5aa9bca6..862c9d10 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -42,14 +42,14 @@ class WrongDataNoticeListener; class ChangeEmailDialog : public Window, public gcn::ActionListener { public: /** - * Constructor + * Constructor. * * @see Window::Window */ ChangeEmailDialog(Window *parent, LoginData *loginData); /** - * Destructor + * Destructor. */ ~ChangeEmailDialog(); diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 5bf6ec0e..7d734a2c 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -421,9 +421,9 @@ void LocalPlayer::lowerAttribute(size_t attr) Net::GameServer::Player::lowerAttribute(attr + CHAR_ATTR_BEGIN); } -const struct LocalPlayer::skillInfo& LocalPlayer::getSkillInfo(int skill) +const struct LocalPlayer::SkillInfo& LocalPlayer::getSkillInfo(int skill) { - static const skillInfo skills[CHAR_SKILL_NB + 1] = + static const SkillInfo skills[CHAR_SKILL_NB + 1] = { { _("Unarmed"), "graphics/gui/unarmed.png" }, // CHAR_SKILL_WEAPON_NONE { _("Knife"), "graphics/gui/knife.png" }, // CHAR_SKILL_WEAPON_KNIFE diff --git a/src/localplayer.h b/src/localplayer.h index be8c020c..64dec1b2 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -337,12 +337,12 @@ class LocalPlayer : public Player void setExperience(int skill, int current, int next); - struct skillInfo { + struct SkillInfo { std::string name; std::string icon; }; - static const struct skillInfo& getSkillInfo(int skill); + static const SkillInfo& getSkillInfo(int skill); std::pair getExperience(int skill); -- cgit v1.2.3-70-g09d2