From 5a701624dae54b64008a126de7ecec7f66bce675 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 1 Jan 2019 19:09:46 +0100
Subject: Minor style fixes

---
 src/live_effects/lpe-copy_rotate.cpp     | 10 ++++------
 src/live_effects/lpe-mirror_symmetry.cpp |  6 ++----
 src/live_effects/lpe-powerclip.cpp       | 12 ++++++------
 3 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/live_effects')

diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 1dda91e6f..3632d3a62 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -135,8 +135,8 @@ LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem)
                     if (id.empty()) {
                         return;
                     }
-                    SPObject *elemref = nullptr;
-                    if (elemref = document->getObjectById(id.c_str())) {
+                    SPObject *elemref = document->getObjectById(id.c_str());
+                    if (elemref) {
                         SP_ITEM(elemref)->setHidden(true);
                     }
                     counter++;
@@ -277,16 +277,14 @@ LPECopyRotate::toItem(Geom::Affine transform, size_t i, bool reset)
     elemref_id += "-";
     elemref_id += this->lpeobj->getId();
     items.push_back(elemref_id);
-    SPObject *elemref= nullptr;
+    SPObject *elemref = document->getObjectById(elemref_id.c_str());
     Inkscape::XML::Node *phantom = nullptr;
-    if (elemref = document->getObjectById(elemref_id.c_str())) {
+    if (elemref) {
         phantom = elemref->getRepr();
     } else {
         phantom = createPathBase(sp_lpe_item);
         phantom->setAttribute("id", elemref_id.c_str());
         reset = true;
-    }
-    if (!elemref) {
         elemref = container->appendChildRepr(phantom);
         Inkscape::GC::release(phantom);
     }
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index 399f1de97..f5359ab85 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -347,16 +347,14 @@ LPEMirrorSymmetry::toMirror(Geom::Affine transform, bool reset)
     elemref_id += this->lpeobj->getId();
     items.clear();
     items.push_back(elemref_id);
-    SPObject *elemref = nullptr;
+    SPObject *elemref = document->getObjectById(elemref_id.c_str());
     Inkscape::XML::Node *phantom = nullptr;
-    if (elemref = document->getObjectById(elemref_id.c_str())) {
+    if (elemref) {
         phantom = elemref->getRepr();
     } else {
         phantom = createPathBase(sp_lpe_item);
         phantom->setAttribute("id", elemref_id.c_str());
         reset = true;
-    }
-    if (!elemref) {
         elemref = container->appendChildRepr(phantom);
         Inkscape::GC::release(phantom);
     }
diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp
index c710de00f..432f2a40d 100644
--- a/src/live_effects/lpe-powerclip.cpp
+++ b/src/live_effects/lpe-powerclip.cpp
@@ -211,8 +211,8 @@ LPEPowerClip::updateInverse (SPItem * clip_data) {
                 updateInverse(subitem);
             }
         } else if (SP_IS_SHAPE(clip_data)) {
-            SPObject *elemref = nullptr;
-            if (elemref = document->getObjectById(Glib::ustring("lpe_") + Glib::ustring(this->getLPEObj()->getId()))) {
+            SPObject *elemref = document->getObjectById(Glib::ustring("lpe_") + Glib::ustring(this->getLPEObj()->getId()));
+            if (elemref) {
                 SPCurve * c = nullptr;
                 c = SP_SHAPE(elemref)->getCurve();
                 if (c) {
@@ -258,8 +258,8 @@ LPEPowerClip::removeInverse (SPItem * clip_data){
                 is_inverse.param_setValue((Glib::ustring)"false", true);
             }
         }
-        SPObject *elemref = nullptr;
-        if (elemref = document->getObjectById(Glib::ustring("lpe_") + Glib::ustring(this->getLPEObj()->getId()))) {
+        SPObject *elemref = document->getObjectById(Glib::ustring("lpe_") + Glib::ustring(this->getLPEObj()->getId()));
+        if (elemref) {
             elemref ->deleteObject(false);
         } 
     }
@@ -298,8 +298,8 @@ LPEPowerClip::doEffect_path(Geom::PathVector const & path_in){
         if (!document) {
             return path_out;
         }
-        SPObject *elemref = nullptr;
-        if (elemref = document->getObjectById(Glib::ustring("lpe_") + Glib::ustring(this->getLPEObj()->getId()))) {
+        SPObject *elemref = document->getObjectById(Glib::ustring("lpe_") + Glib::ustring(this->getLPEObj()->getId()));
+        if (elemref) {
             SPCurve * c = nullptr;
             c = SP_SHAPE(elemref)->getCurve();
             if (c) {
-- 
cgit v1.2.3