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/models/colorlistmodel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/models/colorlistmodel.h') diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h index 1f4bf2e83..49dbffce5 100644 --- a/src/gui/models/colorlistmodel.h +++ b/src/gui/models/colorlistmodel.h @@ -65,12 +65,12 @@ class ColorListModel final : public ListModel ~ColorListModel() { } - int getNumberOfElements() final + int getNumberOfElements() override final { return 14; } - std::string getElementAt(int i) final + std::string getElementAt(int i) override final { if (i >= getNumberOfElements() || i < 0) return "???"; -- cgit v1.2.3-60-g2f50