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

fix some occurrences where size() is misused as Boolean

Browse Source 
- as suggested by @wwmayer: 4d51d1d0b1 (r69648152)
This commit is contained in:
Uwe
2022-03-27 21:38:15 +02:00
parent 14960411a8
commit 66e4c37a25
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/PartDesign/App/ShapeBinder.cpp
View File

@@ -479,17 +479,17 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
if(!Relative.getValue())
parent = nullptr;
else {
if(parent && parent->getSubObject(parentSub.c_str())==this) {
if (parent && parent->getSubObject(parentSub.c_str())==this) {
auto parents = parent->getParents();
if(parents.size()) {
if (!parents.empty()) {
parent = parents.begin()->first;
parentSub = parents.begin()->second + parentSub;
}
} else
parent = nullptr;
if(!parent && parentSub.empty()) {
if (!parent && parentSub.empty()) {
auto parents = getParents();
if(parents.size()) {
if(!parents.empty()) {
parent = parents.begin()->first;
parentSub = parents.begin()->second;
}
@@ -561,7 +561,7 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
auto tmpDoc = App::GetApplication().newDocument(
"_tmp_binder", nullptr, false, true);
auto objs = tmpDoc->copyObject({obj},true,true);
if(objs.size()) {
if (!objs.empty()) {
for(auto it=objs.rbegin(); it!=objs.rend(); ++it)
_CopiedObjs.emplace_back(*it);
copied = objs.back();
@@ -648,7 +648,7 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
if(!init) {
if(errMsg.size()) {
if (!errMsg.empty()) {
if(!(options & UpdateInit))
FC_THROWM(Base::RuntimeError, errMsg);
if(!Shape.getValue().IsNull())
@@ -706,7 +706,7 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
else
solids.push_back(s.getShape());
}
if(solids.size()) {
if (!solids.empty()) {
result = solid.fuse(solids);
fused = true;
} else if (!solid.isNull()) {
@@ -819,7 +819,7 @@ void SubShapeBinder::onChanged(const App::Property *prop) {
if(prop == &Support) {
clearCopiedObjects();
setupCopyOnChange();
if(Support.getSubListValues().size()) {
if (!Support.getSubListValues().empty()) {
update();
if(BindMode.getValue() == 2)
Support.setValue(nullptr);