[TD] remove some more superfluous nullptr checks

This commit is contained in:
Uwe
2022-07-20 11:54:28 +02:00
parent 1819aa9c0c
commit 40d8ebb372
11 changed files with 67 additions and 115 deletions

View File

@@ -805,14 +805,12 @@ void QGIViewPart::removeDecorations()
void QGIViewPart::drawAllSectionLines(void)
{
TechDraw::DrawViewPart *viewPart = static_cast<TechDraw::DrawViewPart *>(getViewObject());
if (!viewPart) {
if (!viewPart)
return;
}
auto vp = static_cast<ViewProviderViewPart*>(getViewProvider(getViewObject()));
if ( vp == nullptr ) {
if (!vp)
return;
}
if (vp->ShowSectionLine.getValue()) {
auto refs = viewPart->getSectionRefs();
for (auto& r:refs) {
@@ -824,20 +822,17 @@ void QGIViewPart::drawAllSectionLines(void)
void QGIViewPart::drawSectionLine(TechDraw::DrawViewSection* viewSection, bool b)
{
TechDraw::DrawViewPart *viewPart = static_cast<TechDraw::DrawViewPart *>(getViewObject());
if (!viewPart) {
if (!viewPart)
return;
}
if (!viewSection)
return;
if (!viewSection->hasGeometry()) {
if (!viewSection->hasGeometry())
return;
}
auto vp = static_cast<ViewProviderViewPart*>(getViewProvider(getViewObject()));
if ( vp == nullptr ) {
if (!vp)
return;
}
if (b) {
QGISectionLine* sectionLine = new QGISectionLine();
@@ -882,14 +877,12 @@ void QGIViewPart::drawSectionLine(TechDraw::DrawViewSection* viewSection, bool b
void QGIViewPart::drawCenterLines(bool b)
{
TechDraw::DrawViewPart *viewPart = dynamic_cast<TechDraw::DrawViewPart *>(getViewObject());
if (!viewPart) {
if (!viewPart)
return;
}
auto vp = static_cast<ViewProviderViewPart*>(getViewProvider(getViewObject()));
if ( vp == nullptr ) {
if (!vp)
return;
}
if (b) {
bool horiz = vp->HorizCenterLine.getValue();
@@ -946,9 +939,8 @@ void QGIViewPart::drawHighlight(TechDraw::DrawViewDetail* viewDetail, bool b)
}
auto vp = static_cast<ViewProviderViewPart*>(getViewProvider(getViewObject()));
if ( vp == nullptr ) {
if (!vp)
return;
}
if (b) {
// double fontSize = getPrefFontSize();