diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-05 15:51:29 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-05 15:51:29 +0000 |
| commit | dbda80349e95767e390a178cda7c05787fbce1fe (patch) | |
| tree | 851cb7ea9e876da0ff50665f16e2410604c79da1 /src/marker.h | |
| parent | Merged Shape and subclasses. Cleaned up a bit. (diff) | |
| download | inkscape-dbda80349e95767e390a178cda7c05787fbce1fe.tar.gz inkscape-dbda80349e95767e390a178cda7c05787fbce1fe.zip | |
Merged Group and subclasses.
(bzr r11608.1.77)
Diffstat (limited to 'src/marker.h')
| -rw-r--r-- | src/marker.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/marker.h b/src/marker.h index bd6d518d0..0300d7199 100644 --- a/src/marker.h +++ b/src/marker.h @@ -20,10 +20,9 @@ #define SP_TYPE_MARKER (sp_marker_get_type ()) #define SP_MARKER(obj) ((SPMarker*)obj) -#define SP_IS_MARKER(obj) (obj != NULL && static_cast<const SPObject*>(obj)->typeHierarchy.count(typeid(SPMarker))) +#define SP_IS_MARKER(obj) (dynamic_cast<const SPMarker*>((SPObject*)obj)) struct SPMarkerView; -class CMarker; #include <2geom/rect.h> #include <2geom/affine.h> @@ -36,7 +35,7 @@ class CMarker; class SPMarker : public SPGroup { public: SPMarker(); - CMarker* cmarker; + virtual ~SPMarker(); /* units */ unsigned int markerUnits_set : 1; @@ -68,17 +67,6 @@ public: /* Private views */ SPMarkerView *views; -}; - -struct SPMarkerClass { - SPGroupClass parent_class; -}; - - -class CMarker : public CGroup { -public: - CMarker(SPMarker* marker); - virtual ~CMarker(); virtual void build(SPDocument *document, Inkscape::XML::Node *repr); virtual void release(); @@ -91,15 +79,8 @@ public: virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type); virtual void print(SPPrintContext *ctx); - -protected: - SPMarker* spmarker; }; - - -GType sp_marker_get_type (void); - class SPMarkerReference : public Inkscape::URIReference { SPMarkerReference(SPObject *obj) : URIReference(obj) {} SPMarker *getObject() const { |