Purged fill type enum

(bzr r3706)

2 files changed, 31 insertions, 32 deletions

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index e2ac69b4c..763913b27 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -917,21 +917,7 @@ SelectedStyle::update()
             } else {
                 paint = &(query->stroke);
             }
-            if (paint->set && paint->type == SP_PAINT_TYPE_COLOR) {
-                guint32 color = sp_color_get_rgba32_falpha (&(paint->value.color), 
-                                     SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value));
-                _lastselected[i] = _thisselected[i];
-                _thisselected[i] = color | 0xff; // only color, opacity === 1
-                ((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color);
-                _color_preview[i]->show_all();
-                place->add(*_color_preview[i]);
-                gchar c_string[64];
-                g_snprintf (c_string, 64, "%06x/%.3g", color >> 8, SP_RGBA32_A_F(color));
-                _tooltips.set_tip(*place, __color[i] + ": " + c_string);
-                _mode[i] = SS_COLOR;
-                _popup_copy[i].set_sensitive(true);
-
-            } else if (paint->set && paint->type == SP_PAINT_TYPE_PAINTSERVER) {
+            if (paint->set && paint->isPaintserver()) {
                 SPPaintServer *server = (i == SS_FILL)? SP_STYLE_FILL_SERVER (query) : SP_STYLE_STROKE_SERVER (query);
                 if ( server ) {
                     Inkscape::XML::Node *srepr = SP_OBJECT_REPR(server);
@@ -959,8 +945,21 @@ SelectedStyle::update()
                 } else {
                     g_warning ("file %s: line %d: Unknown paint server", __FILE__, __LINE__);
                 }
+            } else if (paint->set && paint->isColor()) {
+                guint32 color = sp_color_get_rgba32_falpha (&(paint->value.color),
+                                     SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value));
+                _lastselected[i] = _thisselected[i];
+                _thisselected[i] = color | 0xff; // only color, opacity === 1
+                ((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color);
+                _color_preview[i]->show_all();
+                place->add(*_color_preview[i]);
+                gchar c_string[64];
+                g_snprintf (c_string, 64, "%06x/%.3g", color >> 8, SP_RGBA32_A_F(color));
+                _tooltips.set_tip(*place, __color[i] + ": " + c_string);
+                _mode[i] = SS_COLOR;
+                _popup_copy[i].set_sensitive(true);
 
-            } else if (paint->set && paint->type == SP_PAINT_TYPE_NONE) {
+            } else if (paint->set && paint->isNone()) {
                 place->add(_none[i]);
                 _tooltips.set_tip(*place, __none[i]);
                 _mode[i] = SS_NONE;
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index cad07fbd6..4d5a7fc12 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -289,21 +289,7 @@ StyleSwatch::setStyle(SPStyle *query)
             paint = &(query->stroke);
         }
 
-        if (paint->set && paint->type == SP_PAINT_TYPE_COLOR) {
-            guint32 color = sp_color_get_rgba32_falpha (&(paint->value.color), 
-                                                        SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value));
-            ((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color);
-            _color_preview[i]->show_all();
-            place->add(*_color_preview[i]);
-            gchar *tip;
-            if (i == SS_FILL) {
-                tip = g_strdup_printf (_("Fill: %06x/%.3g"), color >> 8, SP_RGBA32_A_F(color));
-            } else {
-                tip = g_strdup_printf (_("Stroke: %06x/%.3g"), color >> 8, SP_RGBA32_A_F(color));
-            }
-            _tooltips.set_tip(*place, tip);
-            g_free (tip);
-        } else if (paint->set && paint->type == SP_PAINT_TYPE_PAINTSERVER) {
+        if (paint->set && paint->isPaintserver()) {
             SPPaintServer *server = (i == SS_FILL)? SP_STYLE_FILL_SERVER (query) : SP_STYLE_STROKE_SERVER (query);
 
             if (SP_IS_LINEARGRADIENT (server)) {
@@ -320,7 +306,21 @@ StyleSwatch::setStyle(SPStyle *query)
                 _tooltips.set_tip(*place, (i == SS_FILL)? (_("Pattern fill")) : (_("Pattern stroke")));
             }
 
-        } else if (paint->set && paint->type == SP_PAINT_TYPE_NONE) {
+        } else if (paint->set && paint->isColor()) {
+            guint32 color = sp_color_get_rgba32_falpha (&(paint->value.color),
+                                                        SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value));
+            ((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color);
+            _color_preview[i]->show_all();
+            place->add(*_color_preview[i]);
+            gchar *tip;
+            if (i == SS_FILL) {
+                tip = g_strdup_printf (_("Fill: %06x/%.3g"), color >> 8, SP_RGBA32_A_F(color));
+            } else {
+                tip = g_strdup_printf (_("Stroke: %06x/%.3g"), color >> 8, SP_RGBA32_A_F(color));
+            }
+            _tooltips.set_tip(*place, tip);
+            g_free (tip);
+        } else if (paint->set && paint->isNone()) {
             _value[i].set_markup(_("<i>None</i>"));
             place->add(_value[i]);
             _tooltips.set_tip(*place, (i == SS_FILL)? (_("No fill")) : (_("No stroke")));