summaryrefslogtreecommitdiff
path: root/src/gui/userpalette.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
commit55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d (patch)
treeb1108bef76eed589fcb0028c4bd97f14510e940f /src/gui/userpalette.h
parent72b9b0b8b7f3e0b60bf7a926b44aaa589dd131e8 (diff)
downloadmanaplus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.gz
manaplus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.bz2
manaplus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.xz
manaplus-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.zip
Remove override keyword, if it present with final.
Diffstat (limited to 'src/gui/userpalette.h')
-rw-r--r--src/gui/userpalette.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 9f0566198..7c1146f06 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -119,7 +119,7 @@ class UserPalette final : public Palette, public ListModel
*
* @return the number of colors known
*/
- inline int getNumberOfElements() override final A_WARN_UNUSED
+ inline int getNumberOfElements() final A_WARN_UNUSED
{ return CAST_S32(mColors.size()); }
/**
@@ -129,7 +129,7 @@ class UserPalette final : public Palette, public ListModel
*
* @return the name of the color
*/
- std::string getElementAt(int i) override final A_WARN_UNUSED;
+ std::string getElementAt(int i) final A_WARN_UNUSED;
/**
* Commit the colors