summaryrefslogtreecommitdiffstats
path: root/src/display/curve.h
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-09-06 15:25:51 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-09-06 15:25:51 +0000
commit990c48b80c39b942dac8bb87f16189f52ffb0d8e (patch)
tree8281fbe19ea8b1c6cf71c75dc08b338a230d29e3 /src/display/curve.h
parentlpe interpolate points: small code style fix-up. should be done for all LPEs (diff)
downloadinkscape-990c48b80c39b942dac8bb87f16189f52ffb0d8e.tar.gz
inkscape-990c48b80c39b942dac8bb87f16189f52ffb0d8e.zip
More header cleanup
(bzr r13341.1.198)
Diffstat (limited to 'src/display/curve.h')
-rw-r--r--src/display/curve.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/display/curve.h b/src/display/curve.h
index b3f1e3702..5fad75b18 100644
--- a/src/display/curve.h
+++ b/src/display/curve.h
@@ -13,10 +13,12 @@
#ifndef SEEN_DISPLAY_CURVE_H
#define SEEN_DISPLAY_CURVE_H
-#include <glib.h>
#include <2geom/forward.h>
+#include <cstddef>
#include <boost/optional.hpp>
+extern "C" { typedef struct _GSList GSList; }
+
/**
* Wrapper around a Geom::PathVector object.
*/
@@ -37,8 +39,8 @@ public:
SPCurve * copy() const;
- guint get_segment_count() const;
- guint nodes_in_path() const;
+ size_t get_segment_count() const;
+ size_t nodes_in_path() const;
bool is_empty() const;
bool is_closed() const;
@@ -54,13 +56,13 @@ public:
void reset();
void moveto(Geom::Point const &p);
- void moveto(gdouble x, gdouble y);
+ void moveto(double x, double y);
void lineto(Geom::Point const &p);
- void lineto(gdouble x, gdouble y);
+ void lineto(double x, double y);
void quadto(Geom::Point const &p1, Geom::Point const &p2);
- void quadto(gdouble x1, gdouble y1, gdouble x2, gdouble y2);
+ void quadto(double x1, double y1, double x2, double y2);
void curveto(Geom::Point const &p0, Geom::Point const &p1, Geom::Point const &p2);
- void curveto(gdouble x0, gdouble y0, gdouble x1, gdouble y1, gdouble x2, gdouble y2);
+ void curveto(double x0, double y0, double x1, double y1, double x2, double y2);
void closepath();
void closepath_current();
void backspace();
@@ -71,14 +73,14 @@ public:
void last_point_additive_move(Geom::Point const & p);
void append(SPCurve const *curve2, bool use_lineto);
- SPCurve * append_continuous(SPCurve const *c1, gdouble tolerance);
+ SPCurve * append_continuous(SPCurve const *c1, double tolerance);
SPCurve * create_reverse() const;
GSList * split() const;
static SPCurve * concat(GSList const *list);
protected:
- gint _refcount;
+ size_t _refcount;
Geom::PathVector _pathv;