From 7637d58df0ca64c8975cea09b275feadd7241534 Mon Sep 17 00:00:00 2001 From: luz paz Date: Sun, 4 Dec 2022 06:56:22 -0500 Subject: [PATCH] Add missing brackets + change indentation to spaces --- src/App/Metadata.cpp | 75 ++++++++++++--------- src/Gui/DlgGeneralImp.cpp | 3 +- src/Gui/PythonWrapper.cpp | 8 ++- src/Mod/TechDraw/Gui/TaskComplexSection.cpp | 2 +- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/src/App/Metadata.cpp b/src/App/Metadata.cpp index b763435853..024747a2a5 100644 --- a/src/App/Metadata.cpp +++ b/src/App/Metadata.cpp @@ -109,10 +109,10 @@ Metadata::Metadata(const fs::path &metadataFile) _dom = doc->getDocumentElement(); auto rootTagName = StrXUTF8(_dom->getTagName()).str; - if (rootTagName != "package") + if (rootTagName != "package") { throw Base::XMLBaseException( "Malformed package.xml document: Root group not found"); - + } auto formatVersion = XMLString::parseInt(_dom->getAttribute(XUTF8Str("format").unicodeForm())); switch (formatVersion) { case 1: parseVersion1(_dom); break; @@ -183,7 +183,9 @@ std::vector Metadata::operator[](const std::string &tag) { std::vector returnValue; auto range = _genericMetadata.equal_range(tag); - for (auto item = range.first; item != range.second; ++item) returnValue.push_back(item->second); + for (auto item = range.first; item != range.second; ++item) { + returnValue.push_back(item->second); + } return returnValue; } @@ -192,9 +194,9 @@ XERCES_CPP_NAMESPACE::DOMElement *Metadata::dom() const { return _dom; } void Metadata::setName(const std::string &name) { std::string invalidCharacters = "/\\?%*:|\"<>";// Should cover all OSes - if (_name.find_first_of(invalidCharacters) != std::string::npos) + if (_name.find_first_of(invalidCharacters) != std::string::npos) { throw Base::RuntimeError("Name cannot contain any of: " + invalidCharacters); - + } _name = name; } @@ -340,9 +342,9 @@ DOMElement *appendSimpleXMLNode(DOMElement *baseNode, const std::string &nodeNam const std::string &nodeContents) { // For convenience (and brevity of final output) don't create nodes that don't have contents - if (nodeContents.empty()) + if (nodeContents.empty()) { return nullptr; - + } auto doc = baseNode->getOwnerDocument(); DOMElement *namedElement = doc->createElement(XUTF8Str(nodeName.c_str()).unicodeForm()); baseNode->appendChild(namedElement); @@ -353,9 +355,9 @@ DOMElement *appendSimpleXMLNode(DOMElement *baseNode, const std::string &nodeNam void addAttribute(DOMElement *node, const std::string &key, const std::string &value) { - if (value.empty()) + if (value.empty()) { return; - + } node->setAttribute(XUTF8Str(key.c_str()).unicodeForm(), XUTF8Str(value.c_str()).unicodeForm()); } @@ -451,9 +453,9 @@ void Metadata::write(const fs::path &file) const bool Metadata::satisfies(const Meta::Dependency &dep) { - if (dep.package != _name) + if (dep.package != _name) { return false; - + } // The "condition" attribute allows an expression to enable or disable this dependency check: it must contain a valid // FreeCAD Expression. If it evaluates to false, this dependency is bypassed (e.g. this function returns false). if (!dep.condition.empty()) { @@ -473,31 +475,36 @@ bool Metadata::satisfies(const Meta::Dependency &dep) } auto parsedExpression = App::Expression::parse(nullptr, dep.condition); auto result = parsedExpression->eval(); - if (!boost::any_cast(result->getValueAsAny())) + if (!boost::any_cast(result->getValueAsAny())) { return false; + } } - if (!dep.version_eq.empty()) + if (!dep.version_eq.empty()) { return _version == Meta::Version(dep.version_eq); - + } // Any of the others might be specified in pairs, so only return the "false" case - if (!dep.version_lt.empty()) - if (!(_version < Meta::Version(dep.version_lt))) + if (!dep.version_lt.empty()) { + if (!(_version < Meta::Version(dep.version_lt))) { return false; - - if (!dep.version_lte.empty()) - if (!(_version <= Meta::Version(dep.version_lt))) + } + } + if (!dep.version_lte.empty()) { + if (!(_version <= Meta::Version(dep.version_lt))) { return false; - - if (!dep.version_gt.empty()) - if (!(_version > Meta::Version(dep.version_lt))) + } + } + if (!dep.version_gt.empty()) { + if (!(_version > Meta::Version(dep.version_lt))) { return false; - - if (!dep.version_gte.empty()) - if (!(_version >= Meta::Version(dep.version_lt))) + } + } + if (!dep.version_gte.empty()) { + if (!(_version >= Meta::Version(dep.version_lt))) { return false; - + } + } return true; } @@ -514,10 +521,12 @@ bool Metadata::supportsCurrentFreeCAD() const fcVersion = Meta::Version(ss.str()); } - if (_freecadmin != Meta::Version() && _freecadmin > fcVersion) + if (_freecadmin != Meta::Version() && _freecadmin > fcVersion) { return false; - else if (_freecadmax != Meta::Version() && _freecadmax < fcVersion) + } + else if (_freecadmax != Meta::Version() && _freecadmax < fcVersion) { return false; + } return true; } @@ -741,16 +750,17 @@ Meta::Url::Url(const XERCES_CPP_NAMESPACE::DOMElement *e) else type = UrlType::website; - if (type == UrlType::repository) + if (type == UrlType::repository) { branch = StrXUTF8(e->getAttribute(XUTF8Str("branch").unicodeForm())).str; - + } location = StrXUTF8(e->getTextContent()).str; } bool App::Meta::Url::operator==(const Url &rhs) const { - if (type == UrlType::repository && branch != rhs.branch) + if (type == UrlType::repository && branch != rhs.branch) { return false; + } return type == rhs.type && location == rhs.location; } @@ -821,8 +831,9 @@ Meta::Version::Version(const std::string &versionString) : minor(0), patch(0) std::string Meta::Version::str() const { - if (*this == Meta::Version()) + if (*this == Meta::Version()) { return ""; + } std::ostringstream stream; stream << major << "." << minor << "." << patch << suffix; return stream.str(); diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index e1fb9bbe5e..651c4123c5 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -484,8 +484,9 @@ void DlgGeneralImp::onImportConfigClicked() auto result = QMessageBox::question( this, tr("File exists"), tr("A preference pack with that name already exists. Overwrite?")); - if (result == QMessageBox::No) // Maybe someday ask for a new name? + if (result == QMessageBox::No) { // Maybe someday ask for a new name? return; + } } Application::Instance->prefPackManager()->importConfig(packName, path); recreatePreferencePackMenu(); diff --git a/src/Gui/PythonWrapper.cpp b/src/Gui/PythonWrapper.cpp index 13674ed1e9..f737ff45a2 100644 --- a/src/Gui/PythonWrapper.cpp +++ b/src/Gui/PythonWrapper.cpp @@ -261,9 +261,11 @@ public: } auto& pylist = wrappers[obj]; - if (std::find_if(pylist.cbegin(), pylist.cend(), [pyobj](const Py::Object& py) { - return py.ptr() == pyobj; - }) == pylist.end()) { + if (std::find_if(pylist.cbegin(), pylist.cend(), + [pyobj](const Py::Object& py) { + return py.ptr() == pyobj; + }) == pylist.end()) { + pylist.emplace_back(pyobj); } } diff --git a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp index f27eec7f17..54031e0a0d 100644 --- a/src/Mod/TechDraw/Gui/TaskComplexSection.cpp +++ b/src/Mod/TechDraw/Gui/TaskComplexSection.cpp @@ -423,7 +423,7 @@ void TaskComplexSection::enableAll(bool enable) ui->cmbScaleType->setEnabled(enable); QString qScaleType = ui->cmbScaleType->currentText(); //Allow or prevent scale changing initially - if (qScaleType == QString::fromUtf8("Custom")) { + if (qScaleType == QString::fromUtf8("Custom")) { ui->sbScale->setEnabled(true); } else {