Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / display / nr-arena-glyphs.h

diff --git a/src/display/nr-arena-glyphs.h b/src/display/nr-arena-glyphs.h
index a2dda988b5b59fa58b1f3b23615661a6d63f7563..1d15fef8139d08fef8106701860be6acd2d2511e 100644 (file)
--- a/src/display/nr-arena-glyphs.h
+++ b/src/display/nr-arena-glyphs.h
@@ -1,5 +1,5 @@
-#ifndef __NR_ARENA_GLYPHS_H__
-#define __NR_ARENA_GLYPHS_H__
+#ifndef SEEN_NR_ARENA_GLYPHS_H
+#define SEEN_NR_ARENA_GLYPHS_H
 
 /*
  * RGBA display list system for inkscape
@@ -17,15 +17,15 @@
 #define NR_ARENA_GLYPHS(obj) (NR_CHECK_INSTANCE_CAST ((obj), NR_TYPE_ARENA_GLYPHS, NRArenaGlyphs))
 #define NR_IS_ARENA_GLYPHS(obj) (NR_CHECK_INSTANCE_TYPE ((obj), NR_TYPE_ARENA_GLYPHS))
 
-#include <libnrtype/nrtype-forward.h>
+#include "libnrtype/nrtype-forward.h"
 
-#include <display/curve.h>
-#include <forward.h>
-#include <sp-paint-server.h>
-#include <display/nr-arena-item.h>
+#include "forward.h"
+#include "sp-paint-server.h"
+#include "display/nr-arena-item.h"
 
 #define test_glyph_liv
 
+struct SPCurve;
 class Shape;
 
 NRType nr_arena_glyphs_get_type (void);
@@ -33,7 +33,7 @@ NRType nr_arena_glyphs_get_type (void);
 struct NRArenaGlyphs : public NRArenaItem {
        /* Glyphs data */
        SPStyle *style;
-       NRMatrix g_transform;
+       Geom::Matrix g_transform;
        font_instance *font;
        gint glyph;
 
@@ -41,7 +41,7 @@ struct NRArenaGlyphs : public NRArenaItem {
        raster_font *sfont;
        float x, y;
 
-//     NRMatrix cached_tr;
+//     Geom::Matrix cached_tr;
 //     Shape  *cached_shp;
 //     bool   cached_shp_dirty;
 //     bool   cached_style_dirty;
@@ -59,10 +59,10 @@ struct NRArenaGlyphsClass {
        NRArenaItemClass parent_class;
 };
 
-void nr_arena_glyphs_set_path (NRArenaGlyphs *glyphs,
-                              SPCurve *curve, unsigned int lieutenant,
-                              font_instance *font, int glyph,
-                              const NRMatrix *transform);
+void nr_arena_glyphs_set_path ( NRArenaGlyphs *glyphs,
+                                SPCurve *curve, unsigned int lieutenant,
+                                font_instance *font, int glyph,
+                                Geom::Matrix const *transform   );
 void nr_arena_glyphs_set_style (NRArenaGlyphs *glyphs, SPStyle *style);
 
 /* Integrated group of component glyphss */
@@ -100,10 +100,21 @@ struct NRArenaGlyphsGroupClass {
 
 void nr_arena_glyphs_group_clear (NRArenaGlyphsGroup *group);
 
-void nr_arena_glyphs_group_add_component (NRArenaGlyphsGroup *group, font_instance *font, int glyph, const NRMatrix *transform);
+void nr_arena_glyphs_group_add_component (NRArenaGlyphsGroup *group, font_instance *font, int glyph, Geom::Matrix const &transform);
 
 void nr_arena_glyphs_group_set_style (NRArenaGlyphsGroup *group, SPStyle *style);
 
 void nr_arena_glyphs_group_set_paintbox (NRArenaGlyphsGroup *group, const NRRect *pbox);
 
-#endif
+#endif // SEEN_NR_ARENA_GLYPHS_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :