From 1cd2dab81fb9ef9a05f43ca76ec973a9e81f4aef Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 7 Aug 2014 18:41:54 +0200 Subject: [PATCH] + rename duplicate class name --- src/Gui/Transform.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Gui/Transform.cpp b/src/Gui/Transform.cpp index 3796c427fbc1..9500741b6efb 100644 --- a/src/Gui/Transform.cpp +++ b/src/Gui/Transform.cpp @@ -61,7 +61,7 @@ class find_geometry_data (Base::Type::fromName("App::PropertyGeometry")); } }; -class find_placement +class find_transform { public: bool operator () (const std::pair& elem) const @@ -138,7 +138,7 @@ void TransformStrategy::acceptDataTransform(const Base::Matrix4D& mat, App::Docu obj->getPropertyMap(props); // search for the placement property std::map::iterator jt; - jt = std::find_if(props.begin(), props.end(), find_placement()); + jt = std::find_if(props.begin(), props.end(), find_transform()); if (jt != props.end()) { Base::Placement local = static_cast(jt->second)->getValue(); Gui::ViewProvider* vp = doc->getViewProvider(obj); @@ -180,7 +180,7 @@ void TransformStrategy::applyViewTransform(const Base::Placement& plm, App::Docu obj->getPropertyMap(props); // search for the placement property std::map::iterator jt; - jt = std::find_if(props.begin(), props.end(), find_placement()); + jt = std::find_if(props.begin(), props.end(), find_transform()); if (jt != props.end()) { Base::Placement local = static_cast(jt->second)->getValue(); local *= plm; // in case a placement is already set @@ -201,7 +201,7 @@ void TransformStrategy::resetViewTransform(App::DocumentObject* obj) obj->getPropertyMap(props); // search for the placement property std::map::iterator jt; - jt = std::find_if(props.begin(), props.end(), find_placement()); + jt = std::find_if(props.begin(), props.end(), find_transform()); if (jt != props.end()) { Base::Placement local = static_cast(jt->second)->getValue(); Gui::ViewProvider* vp = doc->getViewProvider(obj);