refactor SPIEnum: more type safety

fixes ungrouping of "font-weight:bolder"
fixes "titling-caps" parsing
fixes a casting error in CairoRenderContext::renderGlyphtext

4 files changed, 13 insertions, 13 deletions

diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 13e6c97bc..821037a8d 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -501,7 +501,7 @@ void ObjectsPanel::_setCompositingValues(SPItem *item)
     _blurConnection.block();
 
     // Set the isolation
-    int isolation = item->style->isolation.set ? item->style->isolation.value : SP_CSS_ISOLATION_AUTO;
+    auto isolation = item->style->isolation.set ? item->style->isolation.value : SP_CSS_ISOLATION_AUTO;
     _filter_modifier.set_isolation_mode(isolation, true);
     // Set the opacity
     double opacity = (item->style->opacity.set ? SP_SCALE24_TO_FLOAT(item->style->opacity.value) : 1);
@@ -1574,7 +1574,7 @@ void ObjectsPanel::_isolationChangedIter(const Gtk::TreeIter &iter)
         if (item->style->isolation.value == SP_CSS_ISOLATION_ISOLATE) {
             item->style->mix_blend_mode.set = TRUE;
             item->style->mix_blend_mode.value = SP_CSS_BLEND_NORMAL;
-            _filter_modifier.set_blend_mode(0, false);
+            _filter_modifier.set_blend_mode(SP_CSS_BLEND_NORMAL, false);
         }
         item->updateRepr(SP_OBJECT_WRITE_NO_CHILDREN | SP_OBJECT_WRITE_EXT);
     }
@@ -1607,7 +1607,7 @@ void ObjectsPanel::_blendChangedIter(const Gtk::TreeIter &iter)
             item->style->isolation.value == SP_CSS_ISOLATION_ISOLATE) 
         {
             item->style->mix_blend_mode.value = SP_CSS_BLEND_NORMAL;
-            _filter_modifier.set_blend_mode(0, false);
+            _filter_modifier.set_blend_mode(SP_CSS_BLEND_NORMAL, false);
         } else { 
             item->style->mix_blend_mode.value = _filter_modifier.get_blend_mode();
         }
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index d0442bddd..a3e2368f1 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -142,18 +142,18 @@ sigc::signal<void>& SimpleFilterModifier::signal_opacity_changed()
     return _signal_opacity_changed;
 }
 
-int SimpleFilterModifier::get_isolation_mode()
+SPIsolation SimpleFilterModifier::get_isolation_mode()
 {
     return _isolation.get_active() ? SP_CSS_ISOLATION_ISOLATE : SP_CSS_ISOLATION_AUTO;
 }
 
-void SimpleFilterModifier::set_isolation_mode(const int val, bool notify)
+void SimpleFilterModifier::set_isolation_mode(const SPIsolation val, bool notify)
 {
     _notify = notify;
     _isolation.set_active(val == SP_CSS_ISOLATION_ISOLATE);
 }
 
-int SimpleFilterModifier::get_blend_mode()
+SPBlendMode SimpleFilterModifier::get_blend_mode()
 {
     const Util::EnumData<SPBlendMode> *d = _blend.get_active_data();
     if (d) {
@@ -163,7 +163,7 @@ int SimpleFilterModifier::get_blend_mode()
     }
 }
 
-void SimpleFilterModifier::set_blend_mode(const int val, bool notify)
+void SimpleFilterModifier::set_blend_mode(const SPBlendMode val, bool notify)
 {
     _notify = notify;
     _blend.set_active(val);
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 1892ba463..c19303e95 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -42,11 +42,11 @@ public:
   sigc::signal<void> &signal_opacity_changed();
   sigc::signal<void> &signal_isolation_changed();
 
-  int get_isolation_mode();
-  void set_isolation_mode(const int, bool notify);
+  SPIsolation get_isolation_mode();
+  void set_isolation_mode(const SPIsolation, bool notify);
 
-  int get_blend_mode();
-  void set_blend_mode(const int, bool notify);
+  SPBlendMode get_blend_mode();
+  void set_blend_mode(const SPBlendMode, bool notify);
 
   double get_blur_value() const;
   void set_blur_value(const double);
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 974c46b18..d628870e2 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -259,14 +259,14 @@ ObjectCompositeSettings::_subjectChanged() {
     const int blend_result = _subject->queryStyle(&query, QUERY_STYLE_PROPERTY_BLEND);
     switch(blend_result) {
         case QUERY_STYLE_NOTHING:
-            _filter_modifier.set_blend_mode(0, false);
+            _filter_modifier.set_blend_mode(SP_CSS_BLEND_NORMAL, false);
             break;
         case QUERY_STYLE_SINGLE:
         case QUERY_STYLE_MULTIPLE_SAME:
             _filter_modifier.set_blend_mode(query.mix_blend_mode.value, true); // here dont work mix_blend_mode.set
             break;
         case QUERY_STYLE_MULTIPLE_DIFFERENT:
-            _filter_modifier.set_blend_mode(0, false);
+            _filter_modifier.set_blend_mode(SP_CSS_BLEND_NORMAL, false);
             break;
     }