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

Merge pull request #5044 from chennes/lgtmAppDeclHidesParam

Browse Source 
[App] Fix LGTM warning decl hides param
This commit is contained in:
Chris Hennes
2021-09-19 13:46:42 -05:00
committed by GitHub
parent 8b7da3b0eb 6780ded233
commit 7db39151b9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/App/Expression.cpp
View File

@@ -484,11 +484,11 @@ App::any pyObjectToAny(Py::Object value, bool check) {
if (PyLong_Check(pyvalue))
return App::any(PyLong_AsLong(pyvalue));
else if (PyUnicode_Check(pyvalue)) {
const char* value = PyUnicode_AsUTF8(pyvalue);
if (!value) {
const char* utf8value = PyUnicode_AsUTF8(pyvalue);
if (!utf8value) {
FC_THROWM(Base::ValueError, "Invalid unicode string");
}
return App::any(std::string(value));
return App::any(std::string(utf8value));
}
else {
return App::any(pyObjectWrap(pyvalue));

6
src/App/ObjectIdentifier.cpp
View File

@@ -1490,14 +1490,14 @@ void ObjectIdentifier::String::checkImport(const App::DocumentObject *owner,
else {
str.resize(str.size()-1);
auto mapped = reader->getName(str.c_str());
auto obj = owner->getDocument()->getObject(mapped);
if (!obj) {
auto objForMapped = owner->getDocument()->getObject(mapped);
if (!objForMapped) {
FC_ERR("Cannot find object " << str);
}
else {
isString = true;
forceIdentifier = false;
str = obj->Label.getValue();
str = objForMapped->Label.getValue();
}
}
}

6
src/App/PropertyLinks.cpp
View File

@@ -2729,9 +2729,9 @@ public:
// potentially unchanged. So we just touch at most one.
std::set<Document*> docs;
for(auto link : links) {
auto doc = static_cast<DocumentObject*>(link->getContainer())->getDocument();
auto ret = docs.insert(doc);
if(ret.second && !doc->isTouched())
auto linkdoc = static_cast<DocumentObject*>(link->getContainer())->getDocument();
auto ret = docs.insert(linkdoc);
if(ret.second && !linkdoc->isTouched())
link->touch();
}
}