suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ consistent naming

Browse Source
This commit is contained in:
wmayer 2016-04-13 11:37:09 +02:00
parent 7e01bf11fb
commit e3b609b309
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/PropertyLinks.cpp
View File

@ -737,7 +737,7 @@ void PropertyLinkSubList::Restore(Base::XMLReader &reader)
std::string name = reader.getAttribute("obj"); std::string name = reader.getAttribute("obj");
// In order to do copy/paste it must be allowed to have defined some // 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 // 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! // Property not in an object!
DocumentObject* father = static_cast<DocumentObject*>(getContainer()); DocumentObject* father = static_cast<DocumentObject*>(getContainer());
App::Document* document = father->getDocument(); App::Document* document = father->getDocument();
@ -757,7 +757,7 @@ void PropertyLinkSubList::Restore(Base::XMLReader &reader)
setValues(values,SubNames); setValues(values,SubNames);
} }
void PropertyLinkSubList::Restore_FromLinkSub(XMLReader &reader) void PropertyLinkSubList::RestoreFromLinkSub(XMLReader &reader)
{ {
//Copy-paste from PropertyLinkSub::Restore() //Copy-paste from PropertyLinkSub::Restore()
// read my element // read my element

2
src/App/PropertyLinks.h
View File

@ -288,7 +288,7 @@ public:
virtual void Save (Base::Writer &writer) const; virtual void Save (Base::Writer &writer) const;
virtual void Restore(Base::XMLReader &reader); 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 Property *Copy(void) const;
virtual void Paste(const Property &from); virtual void Paste(const Property &from);

2
src/Mod/Part/App/Part2DObject.cpp
View File

@ -236,7 +236,7 @@ void Part2DObject::Restore(Base::XMLReader &reader)
//reading legacy Support - when the Support could only be a single flat face. //reading legacy Support - when the Support could only be a single flat face.
App::PropertyLinkSub tmp;//getTypeId() is not static =( App::PropertyLinkSub tmp;//getTypeId() is not static =(
if (0 == strcmp(tmp.getTypeId().getName(),TypeName)) { if (0 == strcmp(tmp.getTypeId().getName(),TypeName)) {
static_cast<App::PropertyLinkSubList*>(prop)->Restore_FromLinkSub(reader); static_cast<App::PropertyLinkSubList*>(prop)->RestoreFromLinkSub(reader);
} }
this->MapMode.setValue(Attacher::mmFlatFace); this->MapMode.setValue(Attacher::mmFlatFace);
} }