summaryrefslogtreecommitdiff
path: root/src/guild.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/guild.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/guild.h')
-rw-r--r--src/guild.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/guild.h b/src/guild.h
index e0c9f1583..7e5b63a40 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -48,7 +48,7 @@ class GuildMember final : public Avatar
void setPos(const int pos)
{ mPos = pos; }
- std::string getAdditionString() const final A_WARN_UNUSED;
+ std::string getAdditionString() const override final A_WARN_UNUSED;
protected:
friend class Guild;
@@ -150,10 +150,10 @@ class Guild final : public AvatarListModel
* Get size of members list.
* @return Returns the number of members in the guild.
*/
- int getNumberOfElements() final A_WARN_UNUSED
+ int getNumberOfElements() override final A_WARN_UNUSED
{ return CAST_S32(mMembers.size()); }
- Avatar *getAvatarAt(const int i) final A_WARN_UNUSED;
+ Avatar *getAvatarAt(const int i) override final A_WARN_UNUSED;
/**
* Get whether user can invite users to this guild.