From d604abdfc476146af151d41e2134dcff9011069f Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 13 Apr 2016 11:37:09 +0200 Subject: [PATCH] + consistent naming --- src/App/PropertyLinks.cpp | 4 ++-- src/App/PropertyLinks.h | 2 +- src/Mod/Part/App/Part2DObject.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 5e00cdbb3c..939c9cf8cb 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -737,7 +737,7 @@ void PropertyLinkSubList::Restore(Base::XMLReader &reader) std::string name = reader.getAttribute("obj"); // In order to do copy/paste it must be allowed to have defined some // referenced objects in XML which do not exist anymore in the new - // document. Thus, we should silently ingore this. + // document. Thus, we should silently ignore this. // Property not in an object! DocumentObject* father = static_cast(getContainer()); App::Document* document = father->getDocument(); @@ -757,7 +757,7 @@ void PropertyLinkSubList::Restore(Base::XMLReader &reader) setValues(values,SubNames); } -void PropertyLinkSubList::Restore_FromLinkSub(XMLReader &reader) +void PropertyLinkSubList::RestoreFromLinkSub(XMLReader &reader) { //Copy-paste from PropertyLinkSub::Restore() // read my element diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 87d3c1217f..10d764603b 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -288,7 +288,7 @@ public: virtual void Save (Base::Writer &writer) const; virtual void Restore(Base::XMLReader &reader); - virtual void Restore_FromLinkSub(Base::XMLReader &reader); + virtual void RestoreFromLinkSub(Base::XMLReader &reader); virtual Property *Copy(void) const; virtual void Paste(const Property &from); diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp index d59ca0007e..a578cf271e 100644 --- a/src/Mod/Part/App/Part2DObject.cpp +++ b/src/Mod/Part/App/Part2DObject.cpp @@ -236,7 +236,7 @@ void Part2DObject::Restore(Base::XMLReader &reader) //reading legacy Support - when the Support could only be a single flat face. App::PropertyLinkSub tmp;//getTypeId() is not static =( if (0 == strcmp(tmp.getTypeId().getName(),TypeName)) { - static_cast(prop)->Restore_FromLinkSub(reader); + static_cast(prop)->RestoreFromLinkSub(reader); } this->MapMode.setValue(Attacher::mmFlatFace); }