diff --git a/src/marker.h b/src/marker.h
index 9686b8213514803519e738dc64bf4af51f13885e..f2d74a3a699c230cb73bd8dab5e9bd0ee1cd76a8 100644 (file)
--- a/src/marker.h
+++ b/src/marker.h
* Lauris Kaplinski <lauris@kaplinski.com>
*
* Copyright (C) 1999-2003 Lauris Kaplinski
+ * Copyright (C) 2008 Johan Engelen
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
class SPMarkerClass;
class SPMarkerView;
-#include <libnr/nr-matrix.h>
-#include <libnr/nr-rect.h>
+#include <2geom/rect.h>
+#include <2geom/matrix.h>
#include "svg/svg-length.h"
#include "enums.h"
#include "sp-item-group.h"
unsigned int orient_auto : 1;
float orient;
- /* viewBox; */
- unsigned int viewBox_set : 1;
- NRRect viewBox;
+ /* viewBox; */
+ Geom::OptRect viewBox;
/* preserveAspectRatio */
unsigned int aspect_set : 1;
unsigned int aspect_clip : 1;
/* Child to parent additional transform */
- NR::Matrix c2p;
+ Geom::Matrix c2p;
/* Private views */
SPMarkerView *views;
void sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size);
NRArenaItem *sp_marker_show_instance (SPMarker *marker, NRArenaItem *parent,
unsigned int key, unsigned int pos,
- NR::Matrix const &base, float linewidth);
+ Geom::Matrix const &base, float linewidth);
void sp_marker_hide (SPMarker *marker, unsigned int key);
-const gchar *generate_marker (GSList *reprs, NR::Rect bounds, SPDocument *document, NR::Matrix transform, NR::Matrix move);
+const gchar *generate_marker (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix transform, Geom::Matrix move);
#endif