[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot]
2024-08-25 07:29:24 +00:00
parent 97b58f855f
commit 09386be6a9
7 changed files with 23 additions and 25 deletions

View File

@@ -1012,15 +1012,13 @@ void ParameterGrp::SetASCII(const char* Name, const char* sValue)
{
if (!_pGroupNode) {
if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) {
FC_WARN("Setting attribute "
<< "FCText:" << Name << " in an orphan group " << _cName);
FC_WARN("Setting attribute " << "FCText:" << Name << " in an orphan group " << _cName);
}
return;
}
if (_Clearing) {
if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) {
FC_WARN("Adding attribute "
<< "FCText:" << Name << " while clearing " << GetPath());
FC_WARN("Adding attribute " << "FCText:" << Name << " while clearing " << GetPath());
}
return;
}

View File

@@ -230,7 +230,7 @@ typedef DWORD64(__stdcall* PTRANSLATE_ADDRESS_ROUTINE64)(HANDLE hProcess,
// Some missing defines (for VC5/6):
#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#define INVALID_FILE_ATTRIBUTES ((DWORD) - 1)
#endif
// secure-CRT_functions are only available starting with VC8

View File

@@ -281,13 +281,13 @@ void SetOperations::Cut(std::set<FacetIndex>& facetsCuttingEdge0,
}
} // if (f1.IntersectWithFacet(f2, p0, p1))
} // for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); ++it2)
} // for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); ++it1)
} // if (vecFacets2.size() > 0)
} // if (grid1.GetCtElements(gx1, gy1, gz1) > 0)
} // for (gz1 = 0; gz1 < ctGz1; gz1++)
} // for (gy1 = 0; gy1 < ctGy1; gy1++)
} // for (gx1 = 0; gx1 < ctGx1; gx1++)
} // for (it2 = vecFacets2.begin(); it2 != vecFacets2.end(); ++it2)
} // for (it1 = vecFacets1.begin(); it1 != vecFacets1.end(); ++it1)
} // if (vecFacets2.size() > 0)
} // if (grid1.GetCtElements(gx1, gy1, gz1) > 0)
} // for (gz1 = 0; gz1 < ctGz1; gz1++)
} // for (gy1 = 0; gy1 < ctGy1; gy1++)
} // for (gx1 = 0; gx1 < ctGx1; gx1++)
}
void SetOperations::TriangulateMesh(const MeshKernel& cutMesh, int side)
@@ -416,7 +416,7 @@ void SetOperations::TriangulateMesh(const MeshKernel& cutMesh, int side)
_newMeshFacets[side].push_back(facet);
} // for (i = 0; i < (out->numberoftriangles * 3); i += 3)
} // for (it1 = _facet2points[side].begin(); it1 != _facet2points[side].end(); ++it1)
} // for (it1 = _facet2points[side].begin(); it1 != _facet2points[side].end(); ++it1)
}
void SetOperations::CollectFacets(int side, float mult)

View File

@@ -55,7 +55,7 @@ EditModeInformationOverlayCoinConverter::EditModeInformationOverlayCoinConverter
, drawingParameters(drawingparameters)
, nodeId(0) {
};
};
void EditModeInformationOverlayCoinConverter::convert(const Part::Geometry* geometry, int geoid)
{

View File

@@ -2251,9 +2251,7 @@ void PropertySheet::setPathValue(const ObjectIdentifier& path, const boost::any&
}
}
FC_THROWM(Base::TypeError,
"Invalid path value '"
<< "' for " << getFullName());
FC_THROWM(Base::TypeError, "Invalid path value '" << "' for " << getFullName());
}
const boost::any PropertySheet::getPathValue(const App::ObjectIdentifier& path) const

View File

@@ -132,8 +132,7 @@ STDAPI DllRegisterServer()
L".FCBak\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}",
NULL,
REG_SZ,
(DWORD_PTR)szCLSID_SampleThumbnailProvider}
};
(DWORD_PTR)szCLSID_SampleThumbnailProvider}};
return CreateRegistryKeys(keys, ARRAYSIZE(keys));
}

View File

@@ -331,10 +331,13 @@ TEST_F(ReaderTest, invalidDefaults)
givenDataAsXMLStream(xmlBody);
// Act / Assert
EXPECT_THROW({ Reader()->getAttributeAsInteger("missing", "Not an Integer"); },
std::invalid_argument);
EXPECT_THROW({ Reader()->getAttributeAsInteger("missing", "Not an Unsigned"); },
std::invalid_argument);
EXPECT_THROW({ Reader()->getAttributeAsInteger("missing", "Not a Float"); },
std::invalid_argument);
EXPECT_THROW(
{ Reader()->getAttributeAsInteger("missing", "Not an Integer"); },
std::invalid_argument);
EXPECT_THROW(
{ Reader()->getAttributeAsInteger("missing", "Not an Unsigned"); },
std::invalid_argument);
EXPECT_THROW(
{ Reader()->getAttributeAsInteger("missing", "Not a Float"); },
std::invalid_argument);
}