kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Everywhere: clean up getAttribute conversions

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-26 18:02:24 +01:00
parent 492b8312b3
commit 6786af6ef9
17 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/ComplexGeoData.cpp
View File

@@ -480,7 +480,7 @@ void ComplexGeoData::Restore(Base::XMLReader& reader)
reader.readElement("ElementMap");
bool newTag = false;
if (reader.hasAttribute("new") && reader.getAttribute<long>("new") > 0) {
if (reader.hasAttribute("new") && reader.getAttribute<bool>("new")) {
reader.readEndElement("ElementMap");
reader.readElement("ElementMap2");
newTag = true;

2
src/App/Document.cpp
View File

@@ -1524,7 +1524,7 @@ std::vector<App::DocumentObject*> Document::readObjects(Base::XMLReader& reader)
}
if (reader.hasAttribute("Invalid")) {
obj->setStatus(ObjectStatus::Error,
reader.getAttribute<long>("Invalid") != 0);
reader.getAttribute<bool>("Invalid"));
if (obj->isError() && reader.hasAttribute("Error")) {
d->addRecomputeLog(reader.getAttribute<const char*>("Error"), obj);
}

2
src/App/PropertyExpressionEngine.cpp
View File

@@ -329,7 +329,7 @@ void PropertyExpressionEngine::Restore(Base::XMLReader& reader)
reader.readElement("ExpressionEngine");
int count = reader.getAttribute<double>("count");
if (reader.hasAttribute("xlink") && reader.getAttribute<long>("xlink")) {
if (reader.hasAttribute("xlink") && reader.getAttribute<bool>("xlink")) {
PropertyExpressionContainer::Restore(reader);
}

4
src/App/PropertyLinks.cpp
View File

@@ -4239,7 +4239,7 @@ void PropertyXLink::Restore(Base::XMLReader& reader)
}
setFlag(LinkAllowPartial,
reader.hasAttribute("partial") && reader.getAttribute<long>("partial"));
reader.hasAttribute("partial") && reader.getAttribute<bool>("partial"));
std::string name;
if (file.empty()) {
name = reader.getName(reader.getAttribute<const char*>("name"));
@@ -5128,7 +5128,7 @@ void PropertyXLinkSubList::Restore(Base::XMLReader& reader)
{
reader.readElement("XLinkSubList");
setFlag(LinkAllowPartial,
reader.hasAttribute("partial") && reader.getAttribute<long>("partial"));
reader.hasAttribute("partial") && reader.getAttribute<bool>("partial"));
int count = reader.getAttribute<long>("count");
atomic_change guard(*this, false);
_Links.clear();

4
src/App/StringHasher.cpp
View File

@@ -791,10 +791,10 @@ void StringHasher::Restore(Base::XMLReader& reader)
clear();
reader.readElement("StringHasher");
_hashes->SaveAll = reader.getAttribute<long>("saveall") != 0L;
_hashes->Threshold = static_cast<int>(reader.getAttribute<long>("threshold"));
_hashes->Threshold = reader.getAttribute<int>("threshold");
bool newTag = false;
if (reader.hasAttribute("new") && reader.getAttribute<long>("new") > 0) {
if (reader.hasAttribute("new") && reader.getAttribute<bool>("new")) {
reader.readElement("StringHasher2");
newTag = true;
}

2
src/Gui/Document.cpp
View File

@@ -1687,7 +1687,7 @@ void Document::RestoreDocFile(Base::Reader &reader)
int treeRank = -1;
if (localreader->hasAttribute("treeRank")) {
treeRank = int(localreader->getAttribute<long>("treeRank"));
treeRank = localreader->getAttribute<int>("treeRank");
}
auto pObj = dynamic_cast<ViewProviderDocumentObject*>(getViewProviderByName(name.c_str()));

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

@@ -2009,7 +2009,7 @@ void GeomBSplineCurve::Restore(Base::XMLReader& reader)
int polescount = reader.getAttribute<long>("PolesCount");
int knotscount = reader.getAttribute<long>("KnotsCount");
int degree = reader.getAttribute<long>("Degree");
bool isperiodic = (bool) reader.getAttribute<long>("IsPeriodic");
bool isperiodic = reader.getAttribute<bool>("IsPeriodic");
// Handle(Geom_BSplineCurve) spline = new
// Geom_BSplineCurve(occpoles,occweights,occknots,occmults,degree,

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

@@ -126,7 +126,7 @@ void GeometryDefaultExtension<bool>::restoreAttributes(Base::XMLReader &reader)
{
Part::GeometryPersistenceExtension::restoreAttributes(reader);
value = (bool)reader.getAttribute<long>("value");
value = reader.getAttribute<bool>("value");
}
// ---------- GeometryDoubleExtension ----------

4
src/Mod/Part/App/PropertyTopoShapeList.cpp
View File

@@ -222,10 +222,10 @@ void PropertyTopoShapeList::Restore(Base::XMLReader& reader)
if (!file.empty()) {
reader.addFile(file.c_str(), this);
}
else if (reader.hasAttribute("binary") && reader.getAttribute<long>("binary")) {
else if (reader.hasAttribute("binary") && reader.getAttribute<bool>("binary")) {
newShape->importBinary(reader.beginCharStream());
}
else if (reader.hasAttribute("brep") && reader.getAttribute<long>("brep")) {
else if (reader.hasAttribute("brep") && reader.getAttribute<bool>("brep")) {
newShape->importBrep(reader.beginCharStream());
}
m_restorePointers.push_back(newShape);

2
src/Mod/Robot/App/Waypoint.cpp
View File

@@ -123,7 +123,7 @@ void Waypoint::Restore(XMLReader& reader)
Velocity = (float)reader.getAttribute<double>("vel");
Acceleration = (float)reader.getAttribute<double>("acc");
Cont = (reader.getAttribute<long>("cont") != 0) ? true : false;
Cont = reader.getAttribute<bool>("cont");
Tool = reader.getAttribute<long>("tool");
Base = reader.getAttribute<long>("base");

15
src/Mod/Sketcher/App/Constraint.cpp
View File

@@ -179,16 +179,15 @@ void Constraint::Restore(XMLReader& reader)
{
reader.readElement("Constrain");
Name = reader.getAttribute<const char*>("Name");
Type = static_cast<ConstraintType>(reader.getAttribute<long>("Type"));
Type = reader.getAttribute<ConstraintType>("Type");
Value = reader.getAttribute<double>("Value");
First = reader.getAttribute<long>("First");
FirstPos = static_cast<PointPos>(reader.getAttribute<long>("FirstPos"));
FirstPos = reader.getAttribute<PointPos>("FirstPos");
Second = reader.getAttribute<long>("Second");
SecondPos = reader.getAttribute<PointPos>("SecondPos");
if (this->Type == InternalAlignment) {
AlignmentType = static_cast<InternalAlignmentType>(
reader.getAttribute<long>("InternalAlignmentType"));
AlignmentType = reader.getAttribute<InternalAlignmentType>("InternalAlignmentType");
if (reader.hasAttribute("InternalAlignmentIndex")) {
InternalAlignmentIndex = reader.getAttribute<long>("InternalAlignmentIndex");
@@ -201,7 +200,7 @@ void Constraint::Restore(XMLReader& reader)
// read the third geo group if present
if (reader.hasAttribute("Third")) {
Third = reader.getAttribute<long>("Third");
ThirdPos = static_cast<PointPos>(reader.getAttribute<long>("ThirdPos"));
ThirdPos = reader.getAttribute<PointPos>("ThirdPos");
}
// Read the distance a constraint label has been moved
@@ -214,15 +213,15 @@ void Constraint::Restore(XMLReader& reader)
}
if (reader.hasAttribute("IsDriving")) {
isDriving = reader.getAttribute<long>("IsDriving") ? true : false;
isDriving = reader.getAttribute<bool>("IsDriving");
}
if (reader.hasAttribute("IsInVirtualSpace")) {
isInVirtualSpace = reader.getAttribute<long>("IsInVirtualSpace") ? true : false;
isInVirtualSpace = reader.getAttribute<bool>("IsInVirtualSpace");
}
if (reader.hasAttribute("IsActive")) {
isActive = reader.getAttribute<long>("IsActive") ? true : false;
isActive = reader.getAttribute<bool>("IsActive");
}
}

3
src/Mod/Sketcher/App/SketchGeometryExtension.cpp
View File

@@ -68,8 +68,7 @@ void SketchGeometryExtension::restoreAttributes(Base::XMLReader& reader)
Id = reader.getAttribute<long>("id");
}
InternalGeometryType = static_cast<InternalType::InternalType>(
reader.getAttribute<long>("internalGeometryType"));
InternalGeometryType = reader.getAttribute<InternalType::InternalType>("internalGeometryType");
GeometryModeFlags = GeometryModeFlagType(reader.getAttribute<const char*>("geometryModeFlags"));

2
src/Mod/Spreadsheet/App/PropertySheet.cpp
View File

@@ -425,7 +425,7 @@ void PropertySheet::Restore(Base::XMLReader& reader)
reader.readElement("Cells");
Cnt = reader.getAttribute<long>("Count");
if (reader.hasAttribute("xlink") && reader.getAttribute<long>("xlink")) {
if (reader.hasAttribute("xlink") && reader.getAttribute<bool>("xlink")) {
PropertyExpressionContainer::Restore(reader);
}

10
src/Mod/TechDraw/App/CenterLine.cpp
View File

@@ -931,7 +931,7 @@ void CenterLine::Restore(Base::XMLReader &reader)
m_end.z = reader.getAttribute<double>("Z");
reader.readElement("Mode");
m_mode = static_cast<Mode>(reader.getAttribute<long>("value"));
m_mode = reader.getAttribute<Mode>("value");
reader.readElement("HShift");
m_hShift = reader.getAttribute<double>("value");
@@ -942,9 +942,9 @@ void CenterLine::Restore(Base::XMLReader &reader)
reader.readElement("Extend");
m_extendBy = reader.getAttribute<double>("value");
reader.readElement("Type");
m_type = static_cast<Type>(reader.getAttribute<long>("value"));
m_type = reader.getAttribute<Type>("value");
reader.readElement("Flip");
m_flip2Line = (bool)reader.getAttribute<long>("value")==0?false:true;
m_flip2Line = reader.getAttribute<bool>("value") == 0;
reader.readElement("Faces");
int count = reader.getAttribute<long>("FaceCount");
@@ -991,11 +991,11 @@ void CenterLine::Restore(Base::XMLReader &reader)
tempColor.fromHexString(tempHex);
m_format.setColor(tempColor);
reader.readElement("Visible");
m_format.setVisible( (int)reader.getAttribute<long>("value")==0 ? false : true);
m_format.setVisible(reader.getAttribute<bool>("value"));
//stored geometry
reader.readElement("GeometryType");
GeomType gType = static_cast<GeomType>(reader.getAttribute<long>("value"));
GeomType gType = reader.getAttribute<GeomType>("value");
if (gType == GeomType::GENERIC) {
TechDraw::GenericPtr gen = std::make_shared<TechDraw::Generic> ();
gen->Restore(reader);

4
src/Mod/TechDraw/App/Cosmetic.cpp
View File

@@ -249,7 +249,7 @@ void CosmeticEdge::Restore(Base::XMLReader &reader)
m_format.setVisible(reader.getAttribute<long>("value") != 0);
reader.readElement("GeometryType");
GeomType gType = static_cast<GeomType>(reader.getAttribute<long>("value"));
GeomType gType = reader.getAttribute<GeomType>("value");
if (gType == GeomType::GENERIC) {
TechDraw::GenericPtr gen = std::make_shared<TechDraw::Generic> ();
@@ -405,7 +405,7 @@ void GeomFormat::Restore(Base::XMLReader &reader)
tempColor.fromHexString(tempHex);
m_format.setColor(tempColor);
reader.readElement("Visible");
m_format.setVisible((int)reader.getAttribute<long>("value") == 0 ? false : true);
m_format.setVisible(reader.getAttribute<bool>("value"));
// older documents may not have the LineNumber element, so we need to check the
// next entry. if it is a start element, then we check if it is a start element
// for LineNumber.

2
src/Mod/TechDraw/App/CosmeticVertex.cpp
View File

@@ -149,7 +149,7 @@ void CosmeticVertex::Restore(Base::XMLReader &reader)
reader.readElement("Style");
style = reader.getAttribute<long>("value");
reader.readElement("Visible");
visible = (int)reader.getAttribute<long>("value")==0?false:true;
visible = reader.getAttribute<bool>("value");
Tag::Restore(reader);
}

28
src/Mod/TechDraw/App/Geometry.cpp
View File

@@ -260,21 +260,21 @@ void BaseGeom::Save(Base::Writer &writer) const
void BaseGeom::Restore(Base::XMLReader &reader)
{
reader.readElement("GeomType");
geomType = static_cast<GeomType>(reader.getAttribute<long>("value"));
geomType = reader.getAttribute<GeomType>("value");
reader.readElement("ExtractType");
extractType = static_cast<ExtractionType>(reader.getAttribute<long>("value"));
extractType = reader.getAttribute<ExtractionType>("value");
reader.readElement("EdgeClass");
classOfEdge = static_cast<EdgeClass>(reader.getAttribute<long>("value"));
classOfEdge = reader.getAttribute<EdgeClass>("value");
reader.readElement("HLRVisible");
hlrVisible = reader.getAttribute<long>("value") != 0;
hlrVisible = reader.getAttribute<bool>("value");
reader.readElement("Reversed");
reversed = reader.getAttribute<long>("value") != 0;
reversed = reader.getAttribute<bool>("value");
reader.readElement("Ref3D");
ref3D = reader.getAttribute<long>("value");
reader.readElement("Cosmetic");
cosmetic = reader.getAttribute<long>("value") != 0;
cosmetic = reader.getAttribute<bool>("value");
reader.readElement("Source");
m_source = static_cast<SourceType>(reader.getAttribute<long>("value"));
m_source = reader.getAttribute<SourceType>("value");
reader.readElement("SourceIndex");
m_sourceIndex = reader.getAttribute<long>("value");
reader.readElement("CosmeticTag");
@@ -996,9 +996,9 @@ void AOC::Restore(Base::XMLReader &reader)
reader.readElement("EndAngle");
endAngle = reader.getAttribute<double>("value");
reader.readElement("Clockwise");
cw = (int)reader.getAttribute<long>("value")==0?false:true;
cw = reader.getAttribute<bool>("value");
reader.readElement("Large");
largeArc = (int)reader.getAttribute<long>("value")==0?false:true;
largeArc = reader.getAttribute<bool>("value");
}
//! Generic is a multiline
@@ -1346,15 +1346,15 @@ void Vertex::Restore(Base::XMLReader &reader)
pnt.z = reader.getAttribute<double>("Z");
reader.readElement("Extract");
extractType = static_cast<ExtractionType>(reader.getAttribute<long>("value"));
extractType = reader.getAttribute<ExtractionType>("value");
// reader.readElement("Visible");
// hlrVisible = (bool)reader.getAttribute<long>("value")==0?false:true;
// hlrVisible = reader.getAttribute<bool>("value");
reader.readElement("Ref3D");
ref3D = reader.getAttribute<long>("value");
reader.readElement("IsCenter");
hlrVisible = reader.getAttribute<long>("value") != 0;
hlrVisible = reader.getAttribute<bool>("value");
reader.readElement("Cosmetic");
cosmetic = reader.getAttribute<long>("value") != 0;
cosmetic = reader.getAttribute<bool>("value");
reader.readElement("CosmeticLink");
cosmeticLink = reader.getAttribute<long>("value");
reader.readElement("CosmeticTag");
@@ -1362,7 +1362,7 @@ void Vertex::Restore(Base::XMLReader &reader)
//will restore read to eof looking for "Reference" in old docs?? YES!!
// reader.readElement("Reference");
// m_reference = (bool)reader.getAttribute<long>("value")==0?false:true;
// m_reference = reader.getAttribute<bool>("value");
Tag::Restore(reader, "VertexTag");