From a9c33d8f58404e5e80681bef1d1b82c17653dbd4 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Tue, 29 Mar 2022 12:36:18 -0500
Subject: [PATCH] Import: PR6497 move return statement to new line

---
 src/Mod/Import/App/dxf.cpp            | 15 ++++++++++-----
 src/Mod/Import/Gui/AppImportGuiPy.cpp |  6 ++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Import/App/dxf.cpp b/src/Mod/Import/App/dxf.cpp
index 874f33e79e..21fc50a1a5 100644
--- a/src/Mod/Import/App/dxf.cpp
+++ b/src/Mod/Import/App/dxf.cpp
@@ -2675,7 +2675,8 @@ bool CDxfRead::ReadLwPolyLine()
             case 70:
                 // flags
                 get_line();
-                if(sscanf(m_str, "%d", &flags) != 1)return false;
+                if(sscanf(m_str, "%d", &flags) != 1)
+                    return false;
                 closed = ((flags & 1) != 0);
                 break;
                 case 62:
@@ -2835,7 +2836,8 @@ bool CDxfRead::ReadPolyLine()
             case 70:
                 // flags
                 get_line();
-                if(sscanf(m_str, "%d", &flags) != 1)return false;
+                if(sscanf(m_str, "%d", &flags) != 1)
+                    return false;
                 closed = ((flags & 1) != 0);
                 break;
                 case 62:
@@ -3235,7 +3237,8 @@ bool CDxfRead::ReadLayer()
             case 62:
                 // layer color ; if negative, layer is off
                 get_line();
-                if(sscanf(m_str, "%d", &aci) != 1)return false;
+                if(sscanf(m_str, "%d", &aci) != 1)
+                    return false;
                 break;
 
             case 6: // linetype name
@@ -3259,14 +3262,16 @@ bool CDxfRead::ReadLayer()
 void CDxfRead::DoRead(const bool ignore_errors /* = false */ )
 {
     m_ignore_errors = ignore_errors;
-    if(m_fail)return;
+    if(m_fail)
+        return;
 
     get_line();
 
     while(!((*m_ifs).eof()))
     {
         if (!strcmp( m_str, "$INSUNITS" )){
-            if (!ReadUnits())return;
+            if (!ReadUnits())
+                return;
             continue;
         } // End if - then
 
diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp
index b7b6bb1ac8..ba5cc4cc3b 100644
--- a/src/Mod/Import/Gui/AppImportGuiPy.cpp
+++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp
@@ -298,7 +298,8 @@ public:
 private:
     virtual void applyFaceColors(Part::Feature* part, const std::vector<App::Color>& colors) override {
         auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(Gui::Application::Instance->getViewProvider(part));
-        if (!vp) return;
+        if (!vp)
+            return;
         if(colors.empty()) {
             // vp->MapFaceColor.setValue(true);
             // vp->MapLineColor.setValue(true);
@@ -316,7 +317,8 @@ private:
     }
     virtual void applyEdgeColors(Part::Feature* part, const std::vector<App::Color>& colors) override {
         auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(Gui::Application::Instance->getViewProvider(part));
-        if (!vp) return;
+        if (!vp)
+            return;
         // vp->MapLineColor.setValue(false);
         if(colors.size() == 1)
             vp->LineColor.setValue(colors.front());