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/being/playerrelations.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/being/playerrelations.cpp') diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 69b410d3c..d996b03e3 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -80,7 +80,7 @@ namespace public: ConfigurationObject *writeConfigItem( const std::pair &value, - ConfigurationObject *const cobj) const final + ConfigurationObject *const cobj) const override final { if (!cobj || !value.second) return nullptr; @@ -94,7 +94,7 @@ namespace std::map * readConfigItem(const ConfigurationObject *const cobj, std::map - *const container) const final + *const container) const override final { if (!cobj || !container) return container; @@ -473,7 +473,7 @@ class PIS_nothing final : public PlayerIgnoreStrategy } void ignore(Being *const being A_UNUSED, - const unsigned int flags A_UNUSED) const final + const unsigned int flags A_UNUSED) const override final { } }; @@ -490,7 +490,7 @@ class PIS_dotdotdot final : public PlayerIgnoreStrategy } void ignore(Being *const being, - const unsigned int flags A_UNUSED) const final + const unsigned int flags A_UNUSED) const override final { if (!being) return; @@ -513,7 +513,7 @@ class PIS_blinkname final : public PlayerIgnoreStrategy } void ignore(Being *const being, - const unsigned int flags A_UNUSED) const final + const unsigned int flags A_UNUSED) const override final { if (!being) return; @@ -536,7 +536,7 @@ class PIS_emote final : public PlayerIgnoreStrategy } void ignore(Being *const being, - const unsigned int flags A_UNUSED) const final + const unsigned int flags A_UNUSED) const override final { if (!being) return; -- cgit v1.2.3-60-g2f50