summaryrefslogtreecommitdiff
path: root/src/party.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-21 18:57:48 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-21 18:57:48 +0300
commit35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch)
tree2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/party.h
parentcfe4c893ba4ba30379919636d3c508ebf1594e23 (diff)
downloadplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz
plus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2
plus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz
plus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip
some other fixes from cpplint.
Diffstat (limited to 'src/party.h')
-rw-r--r--src/party.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/party.h b/src/party.h
index 315c9ab69..0ed4b2895 100644
--- a/src/party.h
+++ b/src/party.h
@@ -96,7 +96,7 @@ public:
* Get the id of the party.
* @return Returns the id of the party
*/
- short getId() const A_WARN_UNUSED
+ int16_t getId() const A_WARN_UNUSED
{ return mId; }
/**
@@ -135,7 +135,7 @@ public:
bool getInviteRights() const A_WARN_UNUSED
{ return mCanInviteUsers; }
- void setRights(const short rights);
+ void setRights(const int16_t rights);
bool isMember(const PartyMember *const member) const A_WARN_UNUSED;
@@ -154,7 +154,7 @@ public:
const MemberList *getMembers() const A_WARN_UNUSED
{ return &mMembers; }
- static Party *getParty(const short id) A_WARN_UNUSED;
+ static Party *getParty(const int16_t id) A_WARN_UNUSED;
static void clearParties();
@@ -165,13 +165,13 @@ private:
/**
* Constructor with party id passed to it.
*/
- explicit Party(const short id);
+ explicit Party(const int16_t id);
virtual ~Party();
MemberList mMembers;
std::string mName;
- short mId;
+ int16_t mId;
bool mCanInviteUsers;
};