SPPattern c++-sification: class fields are private

(bzr r13341.6.23)

3 files changed, 26 insertions, 27 deletions

diff --git a/src/knot-holder-entity.cpp b/src/knot-holder-entity.cpp
index 7b79d86a8..c3e48cf49 100644
--- a/src/knot-holder-entity.cpp
+++ b/src/knot-holder-entity.cpp
@@ -136,19 +136,19 @@ KnotHolderEntity::snap_knot_position_constrained(Geom::Point const &p, Inkscape:
 
 static gdouble sp_pattern_extract_theta(SPPattern const *pat)
 {
-    Geom::Affine transf = pat->patternTransform;
+    Geom::Affine transf = pat->get_transform();
     return Geom::atan2(transf.xAxis());
 }
 
 static Geom::Point sp_pattern_extract_scale(SPPattern const *pat)
 {
-    Geom::Affine transf = pat->patternTransform;
+    Geom::Affine transf = pat->get_transform();
     return Geom::Point( transf.expansionX(), transf.expansionY() );
 }
 
 static Geom::Point sp_pattern_extract_trans(SPPattern const *pat)
 {
-    return Geom::Point(pat->patternTransform[4], pat->patternTransform[5]);
+    return Geom::Point(pat->get_transform()[4], pat->get_transform()[5]);
 }
 
 void
@@ -266,7 +266,7 @@ PatternKnotHolderEntityScale::knot_get() const
     gdouble x = pat->get_width();
     gdouble y = pat->get_height();
     Geom::Point delta = Geom::Point(x,y);
-    Geom::Affine a = pat->patternTransform;
+    Geom::Affine a = pat->get_transform();
     a[4] = 0;
     a[5] = 0;
     delta = delta * a;
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 82e3cdacf..c2835eadd 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -213,8 +213,8 @@ void SPPattern::set(unsigned int key, const gchar* value) {
 
 /* fixme: We need ::order_changed handler too (Lauris) */
 
-void pattern_getchildren(SPPattern *pat, std::list<SPObject*>& l)
-{
+void SPPattern::_get_children(std::list<SPObject*>& l) {
+	SPPattern *pat = this;
     for (SPPattern *pat_i = pat; pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
         if (pat_i->firstChild()) { // find the first one with children
 			for (SPObject *child = pat->firstChild() ; child ; child = child->getNext() ) {
@@ -235,7 +235,7 @@ void SPPattern::update(SPCtx* ctx, unsigned int flags) {
 	flags &= SP_OBJECT_MODIFIED_CASCADE;
 
 	std::list<SPObject*> l;
-	pattern_getchildren (this, l);
+	_get_children(l);
 
 	for (SPObjectIterator it = l.begin(); it != l.end(); it++) {
 		SPObject *child = *it;
@@ -260,7 +260,7 @@ void SPPattern::modified(unsigned int flags) {
 	flags &= SP_OBJECT_MODIFIED_CASCADE;
 
 	std::list<SPObject*> l;
-	pattern_getchildren (this, l);
+	_get_children(l);
 
 	for (SPObjectIterator it = l.begin(); it != l.end(); it++) {
 		SPObject *child = *it;
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index 1eec0da7f..3fe0f53d8 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -51,24 +51,6 @@ public:
 	Glib::ustring href;
     SPPatternReference *ref;
 
-    /* patternUnits and patternContentUnits attribute */
-    PatternUnits patternUnits : 1;
-    bool patternUnits_set : 1;
-    PatternUnits patternContentUnits : 1;
-    bool patternContentUnits_set : 1;
-    /* patternTransform attribute */
-    Geom::Affine patternTransform;
-    bool patternTransform_set : 1;
-    /* Tile rectangle */
-    SVGLength x;
-    SVGLength y;
-    SVGLength width;
-    SVGLength height;
-
-    sigc::connection modified_connection;
-
-    bool isValid() const;
-
     gdouble get_x() const;
     gdouble get_y() const;
     gdouble get_width() const;
@@ -89,7 +71,7 @@ public:
     static const gchar *produce(const std::list<Inkscape::XML::Node*> &reprs,
     		Geom::Rect bounds, SPDocument *document, Geom::Affine transform, Geom::Affine move);
 
-
+    bool isValid() const;
 	virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity);
 
 protected:
@@ -101,6 +83,7 @@ protected:
 
 private:
 	bool _has_item_children() const;
+	void _get_children(std::list<SPObject*>& l);
 	SPPattern *_chain() const;
 
 	/**
@@ -117,6 +100,22 @@ private:
 	Gets called when the referenced <pattern> is changed
 	*/
 	void _on_ref_modified(SPObject *ref, guint flags);
+
+    /* patternUnits and patternContentUnits attribute */
+    PatternUnits patternUnits : 1;
+    bool patternUnits_set : 1;
+    PatternUnits patternContentUnits : 1;
+    bool patternContentUnits_set : 1;
+    /* patternTransform attribute */
+    Geom::Affine patternTransform;
+    bool patternTransform_set : 1;
+    /* Tile rectangle */
+    SVGLength x;
+    SVGLength y;
+    SVGLength width;
+    SVGLength height;
+
+    sigc::connection modified_connection;
 };