Merge Master

This commit is contained in:
AgCaliva
2023-08-30 16:24:16 -03:00
2458 changed files with 219581 additions and 231989 deletions

View File

@@ -107,8 +107,8 @@ void PropertyContainer::setPropertyStatus(unsigned char bit,bool value)
{
std::vector<Property*> List;
getPropertyList(List);
for(std::vector<Property*>::const_iterator it=List.begin();it!=List.end();++it)
(**it).StatusBits.set(bit,value);
for(auto it : List)
it->StatusBits.set(bit,value);
}
short PropertyContainer::getPropertyType(const Property* prop) const
@@ -277,21 +277,21 @@ void PropertyContainer::Save (Base::Writer &writer) const
writer.decInd();
// Now store normal properties
for (auto it = Map.begin(); it != Map.end(); ++it)
for (const auto& it : Map)
{
writer.incInd(); // indentation for 'Property name'
writer.Stream() << writer.ind() << "<Property name=\"" << it->first << "\" type=\""
<< it->second->getTypeId().getName();
writer.Stream() << writer.ind() << "<Property name=\"" << it.first << "\" type=\""
<< it.second->getTypeId().getName();
dynamicProps.save(it->second,writer);
dynamicProps.save(it.second,writer);
auto status = it->second->getStatus();
auto status = it.second->getStatus();
if(status)
writer.Stream() << "\" status=\"" << status;
writer.Stream() << "\">";
if(it->second->testStatus(Property::Transient)
|| it->second->getType() & Prop_Transient)
if(it.second->testStatus(Property::Transient)
|| it.second->getType() & Prop_Transient)
{
writer.decInd();
writer.Stream() << "</Property>" << std::endl;
@@ -306,7 +306,7 @@ void PropertyContainer::Save (Base::Writer &writer) const
// We must make sure to handle all exceptions accordingly so that
// the project file doesn't get invalidated. In the error case this
// means to proceed instead of aborting the write operation.
it->second->Save(writer);
it.second->Save(writer);
}
catch (const Base::Exception &e) {
Base::Console().Error("%s\n", e.what());