coding style fixes

4 files changed, 52 insertions, 39 deletions

diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 49ad7c5ed..045470b53 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -32,22 +32,22 @@
 #include <cstdint>
 #include <3rdparty/libuemf/symbol_convert.h>
 
+#include "clear-n_.h"
+#include "display/drawing-item.h"
+#include "display/drawing.h"
 #include "document.h"
-#include "object/sp-root.h"
-#include "object/sp-path.h"
-#include "print.h"
-#include "extension/system.h"
-#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "display/drawing.h"
-#include "display/drawing-item.h"
-#include "clear-n_.h"
-#include "svg/svg.h"
+#include "extension/print.h"
+#include "extension/system.h"
+#include "inkscape.h" // even though it is included indirectly by emf-inout.h
+#include "object/sp-path.h"
+#include "object/sp-root.h"
+#include "print.h"
 #include "svg/css-ostringstream.h"
+#include "svg/svg.h"
 #include "util/units.h" // even though it is included indirectly by emf-inout.h
-#include "inkscape.h"   // even though it is included indirectly by emf-inout.h
 
 #include "emf-print.h"
 #include "emf-inout.h"
@@ -1098,21 +1098,23 @@ Emf::select_pen(PEMF_CALLBACK_DATA d, int index)
             SPILength spilength;
             spilength.read("1");
             int penstyle = (pEmr->lopn.lopnStyle & U_PS_STYLE_MASK);
-            if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level==0 || (d->level>0 && d->dc[d->level].style.stroke_dasharray!=d->dc[d->level-1].style.stroke_dasharray)))
+            if (!d->dc[d->level].style.stroke_dasharray.values.empty() &&
+                (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
+                                                       d->dc[d->level - 1].style.stroke_dasharray)))
                 d->dc[d->level].style.stroke_dasharray.values.clear();
             if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
                 spilength.read("3");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
                 spilength.read("1");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DASHDOTDOT) {
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
 
             d->dc[d->level].style.stroke_dasharray.set = 1;
@@ -1184,7 +1186,9 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
         case U_PS_USERSTYLE:
         {
             if (pEmr->elp.elpNumEntries) {
-                if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level==0 || (d->level>0 && d->dc[d->level].style.stroke_dasharray!=d->dc[d->level-1].style.stroke_dasharray)))
+                if (!d->dc[d->level].style.stroke_dasharray.values.empty() &&
+                    (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
+                                                           d->dc[d->level - 1].style.stroke_dasharray)))
                     d->dc[d->level].style.stroke_dasharray.values.clear();
                 SPILength spilength;
                 for (unsigned int i=0; i<pEmr->elp.elpNumEntries; i++) {
@@ -1207,26 +1211,28 @@ Emf::select_extpen(PEMF_CALLBACK_DATA d, int index)
         case U_PS_DASHDOTDOT:
         {
             int penstyle = (pEmr->elp.elpPenStyle & U_PS_STYLE_MASK);
-            if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level==0 || (d->level>0 && d->dc[d->level].style.stroke_dasharray!=d->dc[d->level-1].style.stroke_dasharray)))
+            if (!d->dc[d->level].style.stroke_dasharray.values.empty() &&
+                (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
+                                                       d->dc[d->level - 1].style.stroke_dasharray)))
                 d->dc[d->level].style.stroke_dasharray.values.clear();
             SPILength spilength;
             if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
                 spilength.read("3");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
                 spilength.read("2");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
                 spilength.read("1");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
                 spilength.read("2");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DASHDOTDOT) {
                 spilength.read("1");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
                 spilength.read("2");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
 
             d->dc[d->level].style.stroke_dasharray.set = 1;
@@ -2363,7 +2369,9 @@ std::cout << "BEFORE DRAW"
                     d->level = d->level + pEmr->iRelative;
             }
             while (old_level > d->level) {
-                if (!d->dc[old_level].style.stroke_dasharray.values.empty() && (old_level==0 || (old_level>0 && d->dc[old_level].style.stroke_dasharray!=d->dc[old_level-1].style.stroke_dasharray))){
+                if (!d->dc[old_level].style.stroke_dasharray.values.empty() &&
+                    (old_level == 0 || (old_level > 0 && d->dc[old_level].style.stroke_dasharray !=
+                                                             d->dc[old_level - 1].style.stroke_dasharray))) {
                     d->dc[old_level].style.stroke_dasharray.values.clear();
                 }
                 if(d->dc[old_level].font_name){
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index ee698ea4a..a4c351d82 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -705,7 +705,7 @@ int PrintEmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
                     n_dash = style->stroke_dasharray.values.size();
                     dash = new uint32_t[n_dash];
                     for (i = 0; i < n_dash; i++) {
-                        dash[i] = MAX(1, (uint32_t) round(scale * style->stroke_dasharray.values[i].value * PX2WORLD));
+                        dash[i] = MAX(1, (uint32_t)round(scale * style->stroke_dasharray.values[i].value * PX2WORLD));
                     }
                 }
             }
@@ -1469,7 +1469,7 @@ unsigned int PrintEmf::stroke(
                 first_frag = fragment;
             }
             slength = elength;
-            slength += style->stroke_dasharray.values[i++].value;  // the gap
+            slength += style->stroke_dasharray.values[i++].value; // the gap
             if (i >= n_dash) {
                 i = 0;
             }
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index d88998a16..1f8d4668d 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -987,21 +987,23 @@ Wmf::select_pen(PWMF_CALLBACK_DATA d, int index)
             int penstyle = (up.Style & U_PS_STYLE_MASK);
             SPILength spilength;
             spilength.read("1");
-            if (!d->dc[d->level].style.stroke_dasharray.values.empty() && (d->level==0 || (d->level>0 && d->dc[d->level].style.stroke_dasharray!=d->dc[d->level-1].style.stroke_dasharray)))
+            if (!d->dc[d->level].style.stroke_dasharray.values.empty() &&
+                (d->level == 0 || (d->level > 0 && d->dc[d->level].style.stroke_dasharray !=
+                                                       d->dc[d->level - 1].style.stroke_dasharray)))
                 d->dc[d->level].style.stroke_dasharray.values.clear();
             if (penstyle==U_PS_DASH || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
                 spilength.read("3");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
                 spilength.read("1");
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DOT || penstyle==U_PS_DASHDOT || penstyle==U_PS_DASHDOTDOT) {
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
             if (penstyle==U_PS_DASHDOTDOT) {
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
-                d->dc[d->level].style.stroke_dasharray.values.push_back( spilength );
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
+                d->dc[d->level].style.stroke_dasharray.values.push_back(spilength);
             }
 
             d->dc[d->level].style.stroke_dasharray.set = 1;
@@ -2444,7 +2446,9 @@ std::cout << "BEFORE DRAW"
                     d->level = d->level + DC;
             }
             while (old_level > d->level) {
-                if (!d->dc[old_level].style.stroke_dasharray.values.empty() && (old_level==0 || (old_level>0 && d->dc[old_level].style.stroke_dasharray!=d->dc[old_level-1].style.stroke_dasharray))){
+                if (!d->dc[old_level].style.stroke_dasharray.values.empty() &&
+                    (old_level == 0 || (old_level > 0 && d->dc[old_level].style.stroke_dasharray !=
+                                                             d->dc[old_level - 1].style.stroke_dasharray))) {
                     d->dc[old_level].style.stroke_dasharray.values.clear();
                 }
                 if(d->dc[old_level].font_name){
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index 3419ac89a..917aded32 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -603,8 +603,9 @@ int PrintWmf::create_pen(SPStyle const *style, const Geom::Affine &transform)
                 int mark_long =0;
                 int i;
                 for (i=0;i<n_dash;i++) {
-                  int mark = style->stroke_dasharray.values[i].value;
-                  if (mark>mark_long) { mark_long = mark; }
+                    int mark = style->stroke_dasharray.values[i].value;
+                    if (mark > mark_long) {
+                        mark_long = mark; }
                   if (mark<mark_short) { mark_short = mark; }
                 }
                 if(mark_long == mark_short){  // only one mark size
@@ -901,7 +902,7 @@ unsigned int PrintWmf::stroke(
                 first_frag = fragment;
             }
             slength = elength;
-            slength += style->stroke_dasharray.values[i++].value;  // the gap
+            slength += style->stroke_dasharray.values[i++].value; // the gap
             if (i >= n_dash) {
                 i = 0;
             }