1 files changed, 19 insertions, 20 deletions
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index f69ba10b3..f021101e2 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -13,21 +13,18 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
-
-#include "sp-item.h"
-
 #define SP_PATTERN(obj) (dynamic_cast<SPPattern*>((SPObject*)obj))
 #define SP_IS_PATTERN(obj) (dynamic_cast<const SPPattern*>((SPObject*)obj) != NULL)
 
 class SPPatternReference;
+class SPItem;
+typedef struct _GSList GSList;
 
 #include "svg/svg-length.h"
 #include "sp-paint-server.h"
 #include "uri-references.h"
 #include "viewbox.h"
 
-#include <stddef.h>
 #include <sigc++/connection.h>
 
 
@@ -37,17 +34,17 @@ public:
 	virtual ~SPPattern();
 
     /* Reference (href) */
-    gchar *href;
+    char *href;
     SPPatternReference *ref;
 
     /* patternUnits and patternContentUnits attribute */
-    guint patternUnits : 1;
-    guint patternUnits_set : 1;
-    guint patternContentUnits : 1;
-    guint patternContentUnits_set : 1;
+    unsigned int patternUnits : 1;
+    unsigned int patternUnits_set : 1;
+    unsigned int patternContentUnits : 1;
+    unsigned int patternContentUnits_set : 1;
     /* patternTransform attribute */
     Geom::Affine patternTransform;
-    guint patternTransform_set : 1;
+    unsigned int patternTransform_set : 1;
     /* Tile rectangle */
     SVGLength x;
     SVGLength y;
@@ -56,6 +53,8 @@ public:
 
     sigc::connection modified_connection;
 
+    bool isValid() const;
+
 	virtual cairo_pattern_t* pattern_new(cairo_t *ct, Geom::OptRect const &bbox, double opacity);
 
 protected:
@@ -85,22 +84,22 @@ enum {
     SP_PATTERN_UNITS_OBJECTBOUNDINGBOX
 };
 
-guint pattern_users (SPPattern *pattern);
+unsigned int pattern_users (SPPattern *pattern);
 SPPattern *pattern_chain (SPPattern *pattern);
-SPPattern *sp_pattern_clone_if_necessary (SPItem *item, SPPattern *pattern, const gchar *property);
+SPPattern *sp_pattern_clone_if_necessary (SPItem *item, SPPattern *pattern, const char *property);
 void sp_pattern_transform_multiply (SPPattern *pattern, Geom::Affine postmul, bool set);
 
-const gchar *pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Affine transform, Geom::Affine move);
+const char *pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Affine transform, Geom::Affine move);
 
 SPPattern *pattern_getroot (SPPattern *pat);
 
-guint pattern_patternUnits (SPPattern const *pat);
-guint pattern_patternContentUnits (SPPattern const *pat);
+unsigned int pattern_patternUnits (SPPattern const *pat);
+unsigned int 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);
-gdouble pattern_width (SPPattern const *pat);
-gdouble pattern_height (SPPattern const *pat);
+double pattern_x (SPPattern const *pat);
+double pattern_y (SPPattern const *pat);
+double pattern_width (SPPattern const *pat);
+double pattern_height (SPPattern const *pat);
 Geom::OptRect pattern_viewBox (SPPattern const *pat);
 
 #endif // SEEN_SP_PATTERN_H