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

[TD] remove some more superfluous nullptr checks

Browse Source
This commit is contained in:
Uwe
2022-07-20 02:53:48 +02:00
parent 8304a0942e
commit 31bc9f3913
31 changed files with 84 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@@ -1185,7 +1185,7 @@ void execHExtent(Gui::Command* cmd)
}
baseFeat = dynamic_cast<TechDraw::DrawViewPart *>(selection[0].getObject());
if( baseFeat == nullptr ) {
if (!baseFeat) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection Error"),
QObject::tr("No base View in Selection."));
return;
@@ -1273,7 +1273,7 @@ void execVExtent(Gui::Command* cmd)
baseFeat = dynamic_cast<TechDraw::DrawViewPart *>(selection[0].getObject());
if( baseFeat == nullptr ) {
if (!baseFeat) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection Error"),
QObject::tr("No base View in Selection."));
return;
@@ -1481,9 +1481,8 @@ int _isValidSingleEdge(Gui::Command* cmd) {
auto selection( cmd->getSelection().getSelectionEx() );
auto objFeat( dynamic_cast<TechDraw::DrawViewPart *>(selection[0].getObject()) );
if( objFeat == nullptr ) {
if (!objFeat)
return isInvalid;
}
const std::vector<std::string> SubNames = selection[0].getSubNames();
if (SubNames.size() != 1 ||
@@ -1579,7 +1578,7 @@ int _isValidEdgeToEdge(Gui::Command* cmd) {
TechDraw::BaseGeomPtr geom0 = objFeat0->getGeomByIndex(GeoId0);
TechDraw::BaseGeomPtr geom1 = objFeat0->getGeomByIndex(GeoId1);
if ((geom0 == nullptr) || (geom1 == nullptr)) { // missing gometry
if (!geom0 || !geom1) { // missing gometry
Base::Console().Error("Logic Error: no geometry for GeoId: %d or GeoId: %d\n",GeoId0,GeoId1);
return isInvalid;
}
@@ -1634,7 +1633,7 @@ bool _isValidVertexToEdge(Gui::Command* cmd) {
}
e = objFeat0->getGeomByIndex(eId);
v = objFeat0->getProjVertexByIndex(vId);
if ((e == nullptr) || (v == nullptr)) {
if (!e || !v) {
Base::Console().Error("Logic Error: no geometry for GeoId: %d or GeoId: %d\n",eId,vId);
return false;
}