From 2aeeb785bf3f166eb9128b72267605bc6535e17f Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Mon, 18 Feb 2019 22:16:38 +0100
Subject: Merge from master

---
 src/style.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/style.cpp')

diff --git a/src/style.cpp b/src/style.cpp
index 87ae6cf2c..305952248 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -478,7 +478,7 @@ SPStyle::~SPStyle() {
     fill_ps_changed_connection.disconnect();
     stroke_ps_changed_connection.disconnect();
 
-// The following should be moved into SPIPaint and SPIFilter
+    // The following should be moved into SPIPaint and SPIFilter
     if (fill.value.href) {
         fill_ps_modified_connection.disconnect();
     }
@@ -501,10 +501,7 @@ SPStyle::~SPStyle() {
     // std::cout << "SPStyle::~SPStyle(): Exit\n" << std::endl;
 }
 
-const std::vector<SPIBase *> SPStyle::properties()
-{
-    return this->_properties;
-}
+const std::vector<SPIBase *> SPStyle::properties() { return this->_properties; }
 
 void
 SPStyle::clear(SPAttributeEnum id) {
-- 
cgit v1.2.3