From 9abc39c892a58a6cff52000ae3671e50bae8a1a9 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 23 Apr 2014 20:46:06 +0200
Subject: Clean up of style code, converting structures to C++ classes. Step 1.

(bzr r13298)
---
 src/display/nr-style.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/display')

diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index 125d0c6d6..3d2d36483 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -201,8 +201,7 @@ void NRStyle::set(SPStyle *style)
  
     if( style->text_decoration_color.set          ||
         style->text_decoration_color.inherit      || 
-        style->text_decoration_color.currentcolor ||
-        style->text_decoration_color.colorSet){
+        style->text_decoration_color.currentcolor ){
         text_decoration_color.set(style->text_decoration_color.value.color);
         text_decoration_useColor = true;
     }
-- 
cgit v1.2.3


From b9f4d7dfe7411f551192a98a3d8151e14149c5ae Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sat, 26 Apr 2014 10:17:28 +0200
Subject: Clean up of style code: Patch from suv: SPStyle: struct -> class

(bzr r13309)
---
 src/display/drawing-group.h       | 2 +-
 src/display/drawing-item.h        | 2 +-
 src/display/drawing-shape.h       | 2 +-
 src/display/drawing-text.h        | 2 +-
 src/display/nr-filter-primitive.h | 2 +-
 src/display/nr-style.h            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/display')

diff --git a/src/display/drawing-group.h b/src/display/drawing-group.h
index 651e9d8af..ab1f9895d 100644
--- a/src/display/drawing-group.h
+++ b/src/display/drawing-group.h
@@ -14,7 +14,7 @@
 
 #include "display/drawing-item.h"
 
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index db803cf60..d89299eeb 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -20,7 +20,7 @@
 #include <2geom/rect.h>
 #include <2geom/affine.h>
 
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-shape.h b/src/display/drawing-shape.h
index 405c789e0..f37de9ce7 100644
--- a/src/display/drawing-shape.h
+++ b/src/display/drawing-shape.h
@@ -15,7 +15,7 @@
 #include "display/drawing-item.h"
 #include "display/nr-style.h"
 
-struct SPStyle;
+class SPStyle;
 class SPCurve;
 
 namespace Inkscape {
diff --git a/src/display/drawing-text.h b/src/display/drawing-text.h
index b863ca2a4..41039d85d 100644
--- a/src/display/drawing-text.h
+++ b/src/display/drawing-text.h
@@ -15,7 +15,7 @@
 #include "display/drawing-group.h"
 #include "display/nr-style.h"
 
-struct SPStyle;
+class SPStyle;
 class font_instance;
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h
index 94bd6abb0..214b2cfc5 100644
--- a/src/display/nr-filter-primitive.h
+++ b/src/display/nr-filter-primitive.h
@@ -16,7 +16,7 @@
 #include "display/nr-filter-types.h"
 #include "svg/svg-length.h"
 
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-style.h b/src/display/nr-style.h
index 717cda899..8b5a0ee3d 100644
--- a/src/display/nr-style.h
+++ b/src/display/nr-style.h
@@ -17,7 +17,7 @@
 #include "color.h"
 
 class SPPaintServer;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 class DrawingContext;
-- 
cgit v1.2.3