From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/gui/userpalette.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/userpalette.h') diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 7c1146f06..9f0566198 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() final A_WARN_UNUSED + inline int getNumberOfElements() override 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) final A_WARN_UNUSED; + std::string getElementAt(int i) override final A_WARN_UNUSED; /** * Commit the colors -- cgit v1.2.3-70-g09d2