From e64c5ee399e7e325ebcfa6e1c0225f36528d94c1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:13:32 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../Sketcher/Gui/PropertyVisualLayerList.cpp | 55 ++++++++++--------- .../Sketcher/Gui/PropertyVisualLayerList.h | 3 +- src/Mod/Sketcher/Gui/VisualLayer.cpp | 31 +++++------ src/Mod/Sketcher/Gui/VisualLayer.h | 3 +- src/Tools/_TEMPLATE_/Gui/PreCompiled.h | 1 - 5 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp index 16536a9b4e..162e5d56e8 100644 --- a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp +++ b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp @@ -23,10 +23,10 @@ #include "PreCompiled.h" #include +#include #include #include #include -#include #include "PropertyVisualLayerList.h" @@ -92,33 +92,34 @@ void PropertyVisualLayerList::Restore(Base::XMLReader& reader) setValues(std::move(layers)); } -void PropertyVisualLayerList::Restore(Base::DocumentReader &reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *containerEl) +void PropertyVisualLayerList::Restore(Base::DocumentReader& reader, + XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl) { - auto Prop_VisualLayerListDOM = reader.FindElementByField(containerEl,"Property","name","VisualLayerList"); - if(Prop_VisualLayerListDOM){ - auto VisualLayerListDOM = reader.FindElement(Prop_VisualLayerListDOM,"VisualLayerList"); - const char* count_cstr = reader.GetAttribute(VisualLayerListDOM,"count"); - if(count_cstr){ - int count = reader.ContentToInt( count_cstr ); - std::vector layers; - layers.reserve(count); - - auto prev_VisualLayerDOM = reader.FindElement(VisualLayerListDOM,"VisualLayer"); - VisualLayer visualLayer; - visualLayer.Restore(reader,prev_VisualLayerDOM); - layers.push_back(std::move(visualLayer)); - for (int i = 1; i < count; i++) { - auto VisualLayerDOM_i = reader.FindNextElement(prev_VisualLayerDOM,"VisualLayer"); - VisualLayer visualLayer; - visualLayer.Restore(reader,VisualLayerDOM_i); - layers.push_back(std::move(visualLayer)); - prev_VisualLayerDOM = VisualLayerDOM_i; - } - - setValues(std::move(layers)); - } - - } + auto Prop_VisualLayerListDOM = + reader.FindElementByField(containerEl, "Property", "name", "VisualLayerList"); + if (Prop_VisualLayerListDOM) { + auto VisualLayerListDOM = reader.FindElement(Prop_VisualLayerListDOM, "VisualLayerList"); + const char* count_cstr = reader.GetAttribute(VisualLayerListDOM, "count"); + if (count_cstr) { + int count = reader.ContentToInt(count_cstr); + std::vector layers; + layers.reserve(count); + + auto prev_VisualLayerDOM = reader.FindElement(VisualLayerListDOM, "VisualLayer"); + VisualLayer visualLayer; + visualLayer.Restore(reader, prev_VisualLayerDOM); + layers.push_back(std::move(visualLayer)); + for (int i = 1; i < count; i++) { + auto VisualLayerDOM_i = reader.FindNextElement(prev_VisualLayerDOM, "VisualLayer"); + VisualLayer visualLayer; + visualLayer.Restore(reader, VisualLayerDOM_i); + layers.push_back(std::move(visualLayer)); + prev_VisualLayerDOM = VisualLayerDOM_i; + } + + setValues(std::move(layers)); + } + } } Property* PropertyVisualLayerList::Copy() const diff --git a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h index f03112a8fb..0fe2091525 100644 --- a/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h +++ b/src/Mod/Sketcher/Gui/PropertyVisualLayerList.h @@ -61,7 +61,8 @@ public: void Save(Base::Writer& writer) const override; void Restore(Base::XMLReader& reader) override; - void Restore(Base::DocumentReader &reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *containerEl) override; + void Restore(Base::DocumentReader& reader, + XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl) override; Property* Copy() const override; void Paste(const Property& from) override; diff --git a/src/Mod/Sketcher/Gui/VisualLayer.cpp b/src/Mod/Sketcher/Gui/VisualLayer.cpp index b3e58bff59..f2f3a3cd9b 100644 --- a/src/Mod/Sketcher/Gui/VisualLayer.cpp +++ b/src/Mod/Sketcher/Gui/VisualLayer.cpp @@ -23,9 +23,9 @@ #include "PreCompiled.h" #include +#include #include #include -#include #include "VisualLayer.h" @@ -89,20 +89,19 @@ void VisualLayer::Restore(Base::XMLReader& reader) lineWidth = reader.getAttributeAsFloat("lineWidth"); } -void VisualLayer::Restore(Base::DocumentReader &reader,XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ContainerDOM) +void VisualLayer::Restore(Base::DocumentReader& reader, + XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* ContainerDOM) { - const char* visible_cstr = reader.GetAttribute(ContainerDOM,"visible"); - if(visible_cstr){ - std::string str = visible_cstr; - visible = (str == "true"); - - const char* linePattern_cstr = reader.GetAttribute(ContainerDOM,"linePattern"); - const char* lineWidth_cstr = reader.GetAttribute(ContainerDOM,"lineWidth"); - if(linePattern_cstr && lineWidth_cstr){ - linePattern = reader.ContentToUnsigned( linePattern_cstr ); - lineWidth = reader.ContentToUnsigned( lineWidth_cstr ); - } - - - } + const char* visible_cstr = reader.GetAttribute(ContainerDOM, "visible"); + if (visible_cstr) { + std::string str = visible_cstr; + visible = (str == "true"); + + const char* linePattern_cstr = reader.GetAttribute(ContainerDOM, "linePattern"); + const char* lineWidth_cstr = reader.GetAttribute(ContainerDOM, "lineWidth"); + if (linePattern_cstr && lineWidth_cstr) { + linePattern = reader.ContentToUnsigned(linePattern_cstr); + lineWidth = reader.ContentToUnsigned(lineWidth_cstr); + } + } } diff --git a/src/Mod/Sketcher/Gui/VisualLayer.h b/src/Mod/Sketcher/Gui/VisualLayer.h index 71dc2ce006..2ab6374647 100644 --- a/src/Mod/Sketcher/Gui/VisualLayer.h +++ b/src/Mod/Sketcher/Gui/VisualLayer.h @@ -51,7 +51,8 @@ public: void Save(Base::Writer& /*writer*/) const; void Restore(Base::XMLReader& /*reader*/); - void Restore(Base::DocumentReader &reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *containerEl); + void Restore(Base::DocumentReader& reader, + XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl); private: unsigned int linePattern; diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h index 44a5c54fc8..25852981af 100644 --- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h +++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h @@ -61,7 +61,6 @@ #include - // Qt Toolkit #ifndef __QtAll__ #include