From 4edb080239b5432286775b0453360244229b5a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 18 Jul 2018 16:57:56 +0200 Subject: [PATCH] SceneGraph: prefix private variable with an underscore. --- src/Magnum/SceneGraph/FeatureGroup.h | 12 ++++++------ src/Magnum/SceneGraph/FeatureGroup.hpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index 6fc89453f..204028a60 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -51,7 +51,7 @@ template class AbstractFeatureGroup { void add(AbstractFeature& feature); void remove(AbstractFeature& feature); - std::vector>> features; + std::vector>> _features; }; /** @@ -76,22 +76,22 @@ template class FeatureGroup: pub /** @brief Whether the group is empty */ bool isEmpty() const { - return AbstractFeatureGroup::features.empty(); + return AbstractFeatureGroup::_features.empty(); } /** @brief Count of features in the group */ std::size_t size() const { - return AbstractFeatureGroup::features.size(); + return AbstractFeatureGroup::_features.size(); } /** @brief Feature at given index */ Feature& operator[](std::size_t index) { - return static_cast(AbstractFeatureGroup::features[index].get()); + return static_cast(AbstractFeatureGroup::_features[index].get()); } /** @overload */ const Feature& operator[](std::size_t index) const { - return static_cast(AbstractFeatureGroup::features[index].get()); + return static_cast(AbstractFeatureGroup::_features[index].get()); } /** @@ -158,7 +158,7 @@ template using FeatureGroup3D = BasicFeatureGroup3D FeatureGroup::~FeatureGroup() { - for(auto i: AbstractFeatureGroup::features) static_cast(i.get())._group = nullptr; + for(auto i: AbstractFeatureGroup::_features) static_cast(i.get())._group = nullptr; } template FeatureGroup& FeatureGroup::add(Feature& feature) { diff --git a/src/Magnum/SceneGraph/FeatureGroup.hpp b/src/Magnum/SceneGraph/FeatureGroup.hpp index e3d30b649..b79c1b8c7 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.hpp +++ b/src/Magnum/SceneGraph/FeatureGroup.hpp @@ -39,11 +39,11 @@ template AbstractFeatureGroup::A template AbstractFeatureGroup::~AbstractFeatureGroup() = default; template void AbstractFeatureGroup::add(AbstractFeature& feature) { - features.push_back(feature); + _features.push_back(feature); } template void AbstractFeatureGroup::remove(AbstractFeature& feature) { - features.erase(std::find_if(features.begin(), features.end(), + _features.erase(std::find_if(_features.begin(), _features.end(), [&feature](AbstractFeature& f) { return &f == &feature; })); }