Re-do some .h files to limit exposure of internal values, .h files,

and dependencies on config.h; return to a simple, concrete boolean type

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 68ef8bad94ea81418f8d353b0639c994e936ab71..eee5eca19ded2ec3da420db8f2f6815484c61754 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -24,6 +24,7 @@ extern "C" {
 #endif
 
 #include "gvcommon.h"
+#include "color.h"
 
     /* active plugin headers */
     typedef struct gvplugin_active_layout_s {
@@ -71,7 +72,7 @@ extern "C" {
        GVCOMMON_t common;
 
        char *config_path;
-       bool config_found;
+       boolean config_found;
 
        /* gvParseArgs */
        char **input_filenames; /* null terminated array of input filenames */
@@ -114,7 +115,7 @@ extern "C" {
        point pb;               /* page size - including margins (inches) */
        boxf bb;                /* graph bb in graph units, not including margins */
        int rotation;           /* rotation - 0 = portrait, 90 = landscape */
-       bool graph_sets_margin, graph_sets_pageSize, graph_sets_rotation;
+       boolean graph_sets_margin, graph_sets_pageSize, graph_sets_rotation;
 
        /* layers */
        char *layerDelims;      /* delimiters in layer names */

diff --git a/lib/gvc/gvcjob.h b/lib/gvc/gvcjob.h
index f104708459d173a16081d5bf4d4ce99ca4ad710e..2458c7b5bbfa8465b7bbd495f140b4972b52546b 100644 (file)
--- a/lib/gvc/gvcjob.h
+++ b/lib/gvc/gvcjob.h
@@ -24,6 +24,7 @@ extern "C" {
 #endif
 
 #include "gvcommon.h"
+#include "color.h"
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
 
@@ -175,9 +176,9 @@ extern "C" {
        char *tooltip;          /* if GVRENDER_DOES_TOOLTIPS */
        char *tailtooltip;
        char *headtooltip; 
-       bool explicit_tooltip;
-       bool explicit_tailtooltip;
-       bool explicit_headtooltip;
+       boolean explicit_tooltip;
+       boolean explicit_tailtooltip;
+       boolean explicit_headtooltip;
 
        char *target;           /* if GVRENDER_DOES_TARGETS */
        char *tailtarget;
@@ -236,13 +237,13 @@ typedef enum {COMPRESSION_NONE, COMPRESSION_ZLIB} compression_t;
        gvplugin_active_loadimage_t loadimage;
        gvdevice_callbacks_t *callbacks;
        pointf device_dpi;
-       bool device_sets_dpi;
+       boolean device_sets_dpi;
 
        void *display;
        int screen;
 
        void *surface;          /* gd or cairo surface */
-       bool external_surface;  /* surface belongs to caller */
+       boolean external_surface;       /* surface belongs to caller */
 
         int flags;             /* emit_graph flags */
 
@@ -282,7 +283,7 @@ typedef enum {COMPRESSION_NONE, COMPRESSION_ZLIB} compression_t;
        pointf  translation;    /* composite translation */
        pointf  devscale;       /* composite device to points: dpi, y_goes_down */
 
-       bool    fit_mode,
+       boolean fit_mode,
                needs_refresh,
                click,
                has_grown,