From b57c7eab1224904d21beac582ab77c8cdf40ed55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Wed, 5 Apr 2023 14:07:25 +0200
Subject: [PATCH] [TechDraw] Improve readability of DrawHatch.cpp

---
 src/Mod/TechDraw/App/DrawHatch.cpp | 51 ++++++++++++------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp
index 9adf8d68f3..6007a63310 100644
--- a/src/Mod/TechDraw/App/DrawHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawHatch.cpp
@@ -97,38 +97,29 @@ PyObject *DrawHatch::getPyObject(void)
 
 bool DrawHatch::faceIsHatched(int i, std::vector<TechDraw::DrawHatch*> hatchObjs)
 {
-    bool result = false;
-    bool found = false;
     for (auto& h:hatchObjs) {
         const std::vector<std::string> &sourceNames = h->Source.getSubValues();
         for (auto& s : sourceNames) {
             int fdx = TechDraw::DrawUtil::getIndexFromName(s);
             if (fdx == i) {
-                result = true;
-                found = true;
-                break;
+                return true;  // Found something
             }
         }
-        if (found) {
-            break;
-        }
     }
-    return result;
+    return false;  // Found nothing
 }
 
 //does this hatch affect face i
 bool DrawHatch::affectsFace(int i)
 {
-    bool result = false;
     const std::vector<std::string> &sourceNames = Source.getSubValues();
     for (auto& s : sourceNames) {
         int fdx = TechDraw::DrawUtil::getIndexFromName(s);
-            if (fdx == i) {
-                result = true;
-                break;
-            }
+        if (fdx == i) {
+            return true;  // Found something
+        }
     }
-    return result;
+    return false;  // Found nothing
 }
 
 //remove a subElement(Face) from Source PropertyLinkSub
@@ -200,30 +191,28 @@ void DrawHatch::unsetupObject(void)
 
 bool DrawHatch::isSvgHatch(void) const
 {
-    bool result = false;
     Base::FileInfo fi(HatchPattern.getValue());
-    if ((fi.extension() == "svg") ||
-        (fi.extension() == "SVG")) {
-        result = true;
+    if (fi.extension() == "svg" ||
+        fi.extension() == "SVG") {
+        return true;
     }
-    return result;
+    return false;
 }
 
 bool DrawHatch::isBitmapHatch(void) const
 {
-    bool result = false;
     Base::FileInfo fi(HatchPattern.getValue());
-    if ((fi.extension() == "bmp") ||
-        (fi.extension() == "BMP") ||
-        (fi.extension() == "png") ||
-        (fi.extension() == "PNG") ||
-        (fi.extension() == "jpg") ||
-        (fi.extension() == "JPG") ||
-        (fi.extension() == "jpeg") ||
-        (fi.extension() == "JPEG") ) {
-        result = true;
+    if (fi.extension() == "bmp" ||
+        fi.extension() == "BMP" ||
+        fi.extension() == "png" ||
+        fi.extension() == "PNG" ||
+        fi.extension() == "jpg" ||
+        fi.extension() == "JPG" ||
+        fi.extension() == "jpeg" ||
+        fi.extension() == "JPEG" ) {
+        return true;
     }
-    return result;
+    return false;
 }
 
 //standard preference getters