diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-05 13:37:33 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-05 13:37:33 +0000 |
| commit | cfe48de7f071e2e07a1f2f2ace3456f7b410e93b (patch) | |
| tree | 281d760873c84db3a67518ab19e61bb213f1eab7 /src/sp-shape.h | |
| parent | Combined some classes. (diff) | |
| download | inkscape-cfe48de7f071e2e07a1f2f2ace3456f7b410e93b.tar.gz inkscape-cfe48de7f071e2e07a1f2f2ace3456f7b410e93b.zip | |
Merged Shape and subclasses. Cleaned up a bit.
(bzr r11608.1.76)
Diffstat (limited to 'src/sp-shape.h')
| -rw-r--r-- | src/sp-shape.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/sp-shape.h b/src/sp-shape.h index c11ce87f3..1cd10640e 100644 --- a/src/sp-shape.h +++ b/src/sp-shape.h @@ -30,20 +30,14 @@ class SPDesktop; namespace Inkscape { class DrawingItem; } - -class CShape; - /** * Base class for shapes, including <path> element */ -class SPShape : public SPLPEItem { +class SPShape : public SPLPEItem, public CLPEItem { public: SPShape(); virtual ~SPShape(); - CShape* cshape; - - void setShape (); SPCurve * getCurve () const; SPCurve * getCurveBeforeLPE () const; void setCurve (SPCurve *curve, unsigned int owner); @@ -60,12 +54,6 @@ public: SPObject *_marker[SP_MARKER_LOC_QTY]; sigc::connection _release_connect [SP_MARKER_LOC_QTY]; sigc::connection _modified_connect [SP_MARKER_LOC_QTY]; -}; - -class CShape : public CLPEItem { -public: - CShape(SPShape* shape); - virtual ~CShape(); virtual void build(SPDocument *document, Inkscape::XML::Node *repr); virtual void release(); @@ -84,9 +72,6 @@ public: virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs); virtual void set_shape(); - -protected: - SPShape* spshape; }; |