diff options
| author | Alexander Brock <zaibu@lunar-orbit.de> | 2016-11-09 00:23:41 +0000 |
|---|---|---|
| committer | Alexander Brock <zaibu@lunar-orbit.de> | 2016-11-09 00:23:41 +0000 |
| commit | 07a86951a15301ccb7eb1446cc1e6d3ca7a68f9b (patch) | |
| tree | 6aa49c38e2bf4ee709737d0b9b019587f8d6bb52 /src/livarot | |
| parent | annotate custom builds, and add correct revno into make dist tarballs (diff) | |
| download | inkscape-07a86951a15301ccb7eb1446cc1e6d3ca7a68f9b.tar.gz inkscape-07a86951a15301ccb7eb1446cc1e6d3ca7a68f9b.zip | |
Move boolop functions from sp_selected_path_<op> to ObjectSet::path<op>
(bzr r15223.1.1)
Diffstat (limited to 'src/livarot')
| -rw-r--r-- | src/livarot/LivarotDefs.h | 12 | ||||
| -rw-r--r-- | src/livarot/Shape.h | 1 | ||||
| -rw-r--r-- | src/livarot/int-line.h | 1 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index abeff3861..d020841b0 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -40,18 +40,6 @@ enum found_between = 4 }; -// boolean operation -enum bool_op -{ - bool_op_union, // A OR B - bool_op_inters, // A AND B - bool_op_diff, // A \ B - bool_op_symdiff, // A XOR B - bool_op_cut, // coupure (pleines) - bool_op_slice // coupure (contour) -}; -typedef enum bool_op BooleanOp; - // types of cap for stroking polylines enum butt_typ { diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h index 98fc2d7bf..da1edc6b3 100644 --- a/src/livarot/Shape.h +++ b/src/livarot/Shape.h @@ -17,6 +17,7 @@ #include <2geom/point.h> #include "livarot/LivarotDefs.h" +#include "object-set.h" class Path; class FloatLigne; diff --git a/src/livarot/int-line.h b/src/livarot/int-line.h index 1d3bbd9d2..ed3ccfb96 100644 --- a/src/livarot/int-line.h +++ b/src/livarot/int-line.h @@ -2,6 +2,7 @@ #define INKSCAPE_LIVAROT_INT_LINE_H #include "livarot/LivarotDefs.h" +#include "object-set.h" /** \file * Coverage with integer boundaries. |