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/id-clash.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/id-clash.cpp')

diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index f59b3b920..7a0bb9c4a 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -53,7 +53,7 @@ const char *href_like_attributes[] = {
 #define NUM_HREF_LIKE_ATTRIBUTES (sizeof(href_like_attributes) / sizeof(*href_like_attributes))
 
 const SPIPaint SPStyle::* SPIPaint_members[] = {
-    &SPStyle::color,
+    //&SPStyle::color,
     &SPStyle::fill,
     &SPStyle::stroke,
 };
-- 
cgit v1.2.3


From 20452bbd40fe1d93b2093cb5dea8e4cb8ae967d3 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 24 Apr 2014 14:53:30 +0200
Subject: Clean up of style code: refactor marker properties. Step 3.

(bzr r13301)
---
 src/id-clash.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/id-clash.cpp')

diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 7a0bb9c4a..8d852315f 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -161,7 +161,7 @@ find_references(SPObject *elem, refmap_type *refmap)
     /* check for url(#...) references in markers */
     const gchar *markers[4] = { "", "marker-start", "marker-mid", "marker-end" };
     for (unsigned i = SP_MARKER_LOC_START; i < SP_MARKER_LOC_QTY; i++) {
-        const gchar *value = style->marker[i].value;
+        const gchar *value = style->marker_ptrs[i]->value;
         if (value) {
             gchar *uri = extract_uri(value);
             if (uri && uri[0] == '#') {
-- 
cgit v1.2.3


From 444217df4c55243d5110c18e1a67110b9893a862 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 25 Apr 2014 07:46:24 +0200
Subject: Clean up of style code: 'color' is not a paint. Step 1.1. Fixes bug
 1312120.

modified:
  src/id-clash.cpp
unknown:
  .comments/
  FILTERS/
  doxygen/
  style-internal.h
  share/attributes/attindex.html
  share/attributes/propidx.html
  share/symbols/FlowSymbolsNew.svg
  src/cxxtests
  src/cxxtests.cpp
  src/cxxtests.log
  src/cxxtests.xml
  src/ui/dialog/symbols.cpp_new

(bzr r13302)
---
 src/id-clash.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/id-clash.cpp')

diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 8d852315f..66357b75b 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -58,7 +58,7 @@ const SPIPaint SPStyle::* SPIPaint_members[] = {
     &SPStyle::stroke,
 };
 const char* SPIPaint_properties[] = {
-    "color",
+    //"color",
     "fill",
     "stroke",
 };
@@ -76,7 +76,7 @@ const char* other_url_properties[] = {
 #define NUM_OTHER_URL_PROPERTIES (sizeof(other_url_properties) / sizeof(*other_url_properties))
 
 const char* clipboard_properties[] = {
-    "color",
+    //"color",
     "fill",
     "filter",
     "stroke",
-- 
cgit v1.2.3