Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in...

[inkscape.git] / src / sp-paint-server.h

diff --git a/src/sp-paint-server.h b/src/sp-paint-server.h
index a76daf4d14643695fc990c7d8284a0dc14c9cf95..a663807b0ba9781a81e1a6575348b263f30f815f 100644 (file)
--- a/src/sp-paint-server.h
+++ b/src/sp-paint-server.h
@@ -21,7 +21,7 @@
 
 class SPPainter;
 
-#define SP_TYPE_PAINT_SERVER (sp_paint_server_get_type ())
+#define SP_TYPE_PAINT_SERVER (SPPaintServer::getType())
 #define SP_PAINT_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_PAINT_SERVER, SPPaintServer))
 #define SP_PAINT_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_PAINT_SERVER, SPPaintServerClass))
 #define SP_IS_PAINT_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_PAINT_SERVER))
@@ -47,8 +47,17 @@ struct SPPaintServer : public SPObject {
     /** List of paints */
     SPPainter *painters;
 
+protected:
+    bool swatch;
+public:
+
+    static GType getType(void);
+
     bool isSwatch() const;
     bool isSolid() const;
+
+private:
+    static void init(SPPaintServer *ps);
 };
 
 struct SPPaintServerClass {
@@ -59,8 +68,6 @@ struct SPPaintServerClass {
     void (* painter_free) (SPPaintServer *ps, SPPainter *painter);
 };
 
-GType sp_paint_server_get_type (void);
-
 SPPainter *sp_paint_server_painter_new (SPPaintServer *ps, Geom::Matrix const &full_transform, Geom::Matrix const &parent_transform, const NRRect *bbox);
 
 SPPainter *sp_painter_free (SPPainter *painter);
@@ -88,4 +95,4 @@ protected:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :