app: move GimpBezierDesc from app/vectors/ to app/core/

app/core/Makefile.am

@@ -51,6 +51,8 @@ libappcore_a_sources = \
 	gimp-utils.h				\
 	gimparea.c				\
 	gimparea.h				\
+	gimpbezierdesc.h			\
+	gimpbezierdesc.c			\
 	gimpbrush.c				\
 	gimpbrush.h				\
 	gimpbrush-header.h			\

app/core/core-types.h

@@ -185,6 +185,24 @@ typedef struct _GimpScanConvert     GimpScanConvert;
 typedef         guint32             GimpTattoo;
 
 
+/* The following hack is made so that we can reuse the definition
+ * the cairo definition of cairo_path_t without having to translate
+ * between our own version of a bezier description and cairos version.
+ *
+ * to avoid having to include <cairo.h> in each and every file
+ * including this file we only use the "real" definition when cairo.h
+ * already has been included and use something else.
+ *
+ * Note that if you really want to work with GimpBezierDesc (except just
+ * passing pointers to it around) you also need to include <cairo.h>.
+ */
+#ifdef CAIRO_VERSION
+typedef cairo_path_t GimpBezierDesc;
+#else
+typedef void * GimpBezierDesc;
+#endif
+
+
 /*  functions  */
 
 typedef void     (* GimpInitStatusFunc)    (const gchar      *text1,

app/core/gimpbezierdesc.c

@@ -23,7 +23,7 @@
 #include <gegl.h>
 #include <cairo.h>
 
-#include "vectors-types.h"
+#include "core-types.h"
 
 #include "gimpbezierdesc.h"
 

app/display/gimpcanvaspath.c

@@ -28,10 +28,9 @@
 
 #include "display-types.h"
 
+#include "core/gimpbezierdesc.h"
 #include "core/gimpparamspecs.h"
 
-#include "vectors/gimpbezierdesc.h"
-
 #include "gimpcanvaspath.h"
 #include "gimpdisplayshell.h"
 #include "gimpdisplayshell-style.h"

app/vectors/Makefile.am

@@ -20,8 +20,6 @@ libappvectors_a_SOURCES = \
 	vectors-types.h		\
 	gimpanchor.c		\
 	gimpanchor.h		\
-	gimpbezierdesc.h	\
-	gimpbezierdesc.c	\
 	gimpbezierstroke.h	\
 	gimpbezierstroke.c	\
 	gimpstroke.h		\

app/vectors/gimpbezierstroke.c

@@ -27,11 +27,11 @@
 
 #include "vectors-types.h"
 
+#include "core/gimpbezierdesc.h"
 #include "core/gimpcoords.h"
 #include "core/gimpcoords-interpolate.h"
 
 #include "gimpanchor.h"
-#include "gimpbezierdesc.h"
 #include "gimpbezierstroke.h"
 
 

app/vectors/gimpvectors.c

@@ -30,6 +30,7 @@
 
 #include "core/gimp.h"
 #include "core/gimp-transform-utils.h"
+#include "core/gimpbezierdesc.h"
 #include "core/gimpchannel-select.h"
 #include "core/gimpcontainer.h"
 #include "core/gimpcontext.h"
@@ -45,7 +46,6 @@
 #include "paint/gimppaintoptions.h"
 
 #include "gimpanchor.h"
-#include "gimpbezierdesc.h"
 #include "gimpstroke.h"
 #include "gimpvectors.h"
 #include "gimpvectors-preview.h"

app/vectors/vectors-types.h

@@ -21,10 +21,12 @@
 #ifndef __VECTORS_TYPES_H__
 #define __VECTORS_TYPES_H__
 
+
 #include "core/core-types.h"
 
 #include "vectors/vectors-enums.h"
 
+
 typedef struct _GimpAnchor          GimpAnchor;
 
 typedef struct _GimpVectors         GimpVectors;
@@ -34,23 +36,5 @@ typedef struct _GimpVectorsPropUndo GimpVectorsPropUndo;
 typedef struct _GimpStroke          GimpStroke;
 typedef struct _GimpBezierStroke    GimpBezierStroke;
 
-/*
- * The following hack is made so that we can reuse the definition
- * the cairo definition of cairo_path_t without having to translate
- * between our own version of a bezier description and cairos version.
- *
- * to avoid having to include <cairo/cairo.h> in each and every file
- * including this file we only use the "real" definition when cairo.h
- * already has been included and use something else.
- *
- * Note that if you really want to work with GimpBezierDesc (except just
- * passing pointers to it around) you also need to include <cairo/cairo.h>.
- */
-
-#ifdef CAIRO_VERSION
-typedef cairo_path_t GimpBezierDesc;
-#else
-typedef void * GimpBezierDesc;
-#endif
 
 #endif /* __VECTORS_TYPES_H__ */