SPPattern c++-sification: replaced guint by bool and enum

(bzr r13341.6.16)

3 files changed, 34 insertions, 34 deletions

diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index c09b8e9c8..2ace19ae5 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -1015,7 +1015,7 @@ CairoRenderContext::_createPatternPainter(SPPaintServer const *const paintserver
 
     TRACE(("%f x %f pattern\n", width, height));
 
-    if (pbox && pattern_patternUnits(pat) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) {
+    if (pbox && pattern_patternUnits(pat) == SPPattern::UNITS_OBJECTBOUNDINGBOX) {
         //Geom::Affine bbox2user (pbox->x1 - pbox->x0, 0.0, 0.0, pbox->y1 - pbox->y0, pbox->x0, pbox->y0);
         bbox_width_scaler = pbox->width();
         bbox_height_scaler = pbox->height();
@@ -1048,7 +1048,7 @@ CairoRenderContext::_createPatternPainter(SPPaintServer const *const paintserver
         pcs2dev[3] = h / view_box.height();
         pcs2dev[4] = x - view_box.left() * pcs2dev[0];
         pcs2dev[5] = y - view_box.top() * pcs2dev[3];
-    } else if (pbox && pattern_patternContentUnits(pat) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) {
+    } else if (pbox && pattern_patternContentUnits(pat) == SPPattern::UNITS_OBJECTBOUNDINGBOX) {
         pcs2dev[0] = pbox->width();
         pcs2dev[3] = pbox->height();
     }
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 9b7330a24..c5461d302 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -59,14 +59,14 @@ SPPattern::SPPattern() : SPPaintServer(), SPViewBox() {
 	this->ref = new SPPatternReference(this);
 	this->ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(pattern_ref_changed), this));
 
-	this->patternUnits = SP_PATTERN_UNITS_OBJECTBOUNDINGBOX;
-	this->patternUnits_set = FALSE;
+	this->patternUnits = UNITS_OBJECTBOUNDINGBOX;
+	this->patternUnits_set = false;
 
-	this->patternContentUnits = SP_PATTERN_UNITS_USERSPACEONUSE;
-	this->patternContentUnits_set = FALSE;
+	this->patternContentUnits = UNITS_USERSPACEONUSE;
+	this->patternContentUnits_set = false;
 
 	this->patternTransform = Geom::identity();
-	this->patternTransform_set = FALSE;
+	this->patternTransform_set = false;
 
 	this->x.unset();
 	this->y.unset();
@@ -116,14 +116,14 @@ void SPPattern::set(unsigned int key, const gchar* value) {
 	case SP_ATTR_PATTERNUNITS:
 		if (value) {
 			if (!strcmp (value, "userSpaceOnUse")) {
-				this->patternUnits = SP_PATTERN_UNITS_USERSPACEONUSE;
+				this->patternUnits = UNITS_USERSPACEONUSE;
 			} else {
-				this->patternUnits = SP_PATTERN_UNITS_OBJECTBOUNDINGBOX;
+				this->patternUnits = UNITS_OBJECTBOUNDINGBOX;
 			}
 
-			this->patternUnits_set = TRUE;
+			this->patternUnits_set = true;
 		} else {
-			this->patternUnits_set = FALSE;
+			this->patternUnits_set = false;
 		}
 
 		this->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -132,14 +132,14 @@ void SPPattern::set(unsigned int key, const gchar* value) {
 	case SP_ATTR_PATTERNCONTENTUNITS:
 		if (value) {
 			if (!strcmp (value, "userSpaceOnUse")) {
-				this->patternContentUnits = SP_PATTERN_UNITS_USERSPACEONUSE;
+				this->patternContentUnits = UNITS_USERSPACEONUSE;
 			} else {
-				this->patternContentUnits = SP_PATTERN_UNITS_OBJECTBOUNDINGBOX;
+				this->patternContentUnits = UNITS_OBJECTBOUNDINGBOX;
 			}
 
-			this->patternContentUnits_set = TRUE;
+			this->patternContentUnits_set = true;
 		} else {
-			this->patternContentUnits_set = FALSE;
+			this->patternContentUnits_set = false;
 		}
 
 		this->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -150,10 +150,10 @@ void SPPattern::set(unsigned int key, const gchar* value) {
 
 		if (value && sp_svg_transform_read (value, &t)) {
 			this->patternTransform = t;
-			this->patternTransform_set = TRUE;
+			this->patternTransform_set = true;
 		} else {
 			this->patternTransform = Geom::identity();
-			this->patternTransform_set = FALSE;
+			this->patternTransform_set = false;
 		}
 
 		this->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -399,7 +399,7 @@ sp_pattern_transform_multiply (SPPattern *pattern, Geom::Affine postmul, bool se
     } else {
         pattern->patternTransform = pattern_patternTransform(pattern) * postmul;
     }
-    pattern->patternTransform_set = TRUE;
+    pattern->patternTransform_set = true;
 
     gchar *c=sp_svg_transform_write(pattern->patternTransform);
     pattern->getRepr()->setAttribute("patternTransform", c);
@@ -455,7 +455,7 @@ SPPattern *pattern_getroot(SPPattern *pat)
 // Access functions that look up fields up the chain of referenced patterns and return the first one which is set
 // FIXME: all of them must use chase_hrefs the same as in SPGradient, to avoid lockup on circular refs
 
-guint pattern_patternUnits (SPPattern const *pat)
+SPPattern::PatternUnits pattern_patternUnits (SPPattern const *pat)
 {
     for (SPPattern const *pat_i = pat; pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
         if (pat_i->patternUnits_set)
@@ -464,7 +464,7 @@ guint pattern_patternUnits (SPPattern const *pat)
     return pat->patternUnits;
 }
 
-guint pattern_patternContentUnits (SPPattern const *pat)
+SPPattern::PatternUnits pattern_patternContentUnits (SPPattern const *pat)
 {
     for (SPPattern const *pat_i = pat; pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
         if (pat_i->patternContentUnits_set)
@@ -603,7 +603,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
     double tile_y      = pattern_y(this);
     double tile_width  = pattern_width(this);
     double tile_height = pattern_height(this);
-    if ( bbox && (pattern_patternUnits(this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) ) {
+    if ( bbox && (pattern_patternUnits(this) == UNITS_OBJECTBOUNDINGBOX) ) {
         tile_x      *= bbox->width();
         tile_y      *= bbox->height();
         tile_width  *= bbox->width();
@@ -625,7 +625,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b
     } else {
 
         // Content to bbox
-        if (bbox && (pattern_patternContentUnits(this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) ) {
+        if (bbox && (pattern_patternContentUnits(this) == UNITS_OBJECTBOUNDINGBOX) ) {
             content2ps = Geom::Affine(bbox->width(), 0.0, 0.0, bbox->height(), 0,0);
         }
     }
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index eb34b6714..d836e7a42 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -33,6 +33,11 @@ class SPPatternReference;
 
 class SPPattern : public SPPaintServer, public SPViewBox {
 public:
+    enum PatternUnits {
+        UNITS_USERSPACEONUSE,
+        UNITS_OBJECTBOUNDINGBOX
+    };
+
 	SPPattern();
 	virtual ~SPPattern();
 
@@ -41,13 +46,13 @@ public:
     SPPatternReference *ref;
 
     /* patternUnits and patternContentUnits attribute */
-    guint patternUnits : 1;
-    guint patternUnits_set : 1;
-    guint patternContentUnits : 1;
-    guint patternContentUnits_set : 1;
+    PatternUnits patternUnits : 1;
+    bool patternUnits_set : 1;
+    PatternUnits patternContentUnits : 1;
+    bool patternContentUnits_set : 1;
     /* patternTransform attribute */
     Geom::Affine patternTransform;
-    guint patternTransform_set : 1;
+    bool patternTransform_set : 1;
     /* Tile rectangle */
     SVGLength x;
     SVGLength y;
@@ -82,11 +87,6 @@ protected:
     }
 };
 
-enum {
-    SP_PATTERN_UNITS_USERSPACEONUSE,
-    SP_PATTERN_UNITS_OBJECTBOUNDINGBOX
-};
-
 guint pattern_users (SPPattern *pattern);
 SPPattern *pattern_chain (SPPattern *pattern);
 SPPattern *sp_pattern_clone_if_necessary (SPItem *item, SPPattern *pattern, const gchar *property);
@@ -96,8 +96,8 @@ const gchar *pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *documen
 
 SPPattern *pattern_getroot (SPPattern *pat);
 
-guint pattern_patternUnits (SPPattern const *pat);
-guint pattern_patternContentUnits (SPPattern const *pat);
+SPPattern::PatternUnits pattern_patternUnits (SPPattern const *pat);
+SPPattern::PatternUnits pattern_patternContentUnits (SPPattern const *pat);
 Geom::Affine const &pattern_patternTransform(SPPattern const *pat);
 gdouble pattern_x (SPPattern const *pat);
 gdouble pattern_y (SPPattern const *pat);