clean up some transitive includes

diff --git a/lib/common/args.c b/lib/common/args.c
index d4b92760bfb3e32b20ac617663e0c8f15b6ba3ec..4882af4fb2b614f3dc46c9565923c761f1768b92 100644 (file)
--- a/lib/common/args.c
+++ b/lib/common/args.c
@@ -28,9 +28,6 @@
 #endif
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 #include "tlayout.h"
 
 /* Default layout values, possibly set via command line; -1 indicates unset */

diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 68e84fc4ededb28f6d3d5e337963ef00b191978a..61b8bb32e6759579f388a6c32aa85a0aa3063301 100644 (file)
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -16,9 +16,6 @@
 
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 
 #define EPSILON .0001
 

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 7e1b91f101d4638883cbeed71111ca4090cd070c..f2268a140e0e3acdbe44a473d8a1658eaa25c3f0 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -20,9 +20,6 @@
 
 #include <ctype.h>
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 #include "agxbuf.h"
 
 static char *defaultlinestyle[3] = { "solid\0", "setlinewidth\0001\0", 0 };

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index 9a3da14cd5725ac065f1501d2fedcb0db68da8ac..6d018540ab9aba2fc71733ff4cd8a7c1eb0337e3 100644 (file)
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -15,9 +15,6 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 #include "utils.h"
 
 //#ifdef HAVE_CAIRO

diff --git a/lib/common/gdtextsize.c b/lib/common/gdtextsize.c
index 2b976379d789477c2172a7697b439b84910d23b6..ad5e032443844231058ac9fa6145db6178492e64 100644 (file)
--- a/lib/common/gdtextsize.c
+++ b/lib/common/gdtextsize.c
@@ -15,10 +15,7 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include       "gd.h"
+#include "gd.h"
 
 /* sometimes fonts are stored under a different name */
 char *gd_alternate_fontlist(char *font)

diff --git a/lib/common/gdusershape.c b/lib/common/gdusershape.c
index 015cc6821e12ffecb39e68dc8018632d3f200866..72dd62d60dee55e2de20da7725392cabb53d41fc 100644 (file)
--- a/lib/common/gdusershape.c
+++ b/lib/common/gdusershape.c
@@ -15,10 +15,7 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include                "gd.h"
+#include "gd.h"
 
 static Dict_t *ImageDict;
 

diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index eaeadf9a60fbae710b12d68a85c9f7113317eb0a..e4bac406be4d1193fd5f9f6fcb9439f2d86368ac 100644 (file)
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -16,9 +16,6 @@
 
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 #include "htmltable.h"
 #include "htmlparse.h"
 #include "htmllex.h"

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index cbe427e00d09da55b70b4ff069e7ed770ef59aa9..f0b089568b26af02919c9daa5f0e3020dbff4e27 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -34,9 +34,6 @@
  * handled correctly by the table.
  */
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 #include "htmltable.h"
 #include "agxbuf.h"
 #include "pointset.h"

diff --git a/lib/common/htmltable.h b/lib/common/htmltable.h
index 3a8499b595cc8def1058832aaa2278c59a30df2e..9187e79d6d2138e21104f48aa5beeac50e0f0f1d 100644 (file)
--- a/lib/common/htmltable.h
+++ b/lib/common/htmltable.h
@@ -21,11 +21,6 @@ extern "C" {
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-
 #define FIXED_FLAG 1
 #define HALIGN_RIGHT (1 << 1)
 #define HALIGN_LEFT (1 << 2)

diff --git a/lib/common/input.c b/lib/common/input.c
index 3c3f652ac570af14f982d2cd3ef47862ae2131ba..8375ae167e14ad9173da9c766b838bb6cc1ec781 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -14,12 +14,9 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include       <ctype.h>
+#include <ctype.h>
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include       "htmltable.h"
+#include "htmltable.h"
 
 char *Gvfilepath;
 

diff --git a/lib/common/labels.c b/lib/common/labels.c
index d77c03deaed522eb2ef71eb7186bb374aeb3546c..45d0c72d5c92479cbe7dcbfafe179506ebc76533 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -16,11 +16,8 @@
 
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include       "htmltable.h"
-#include       <limits.h>
+#include "htmltable.h"
+#include <limits.h>
 
 #ifndef DISABLE_CODEGENS
 extern codegen_t *Output_codegen;

diff --git a/lib/common/ns.c b/lib/common/ns.c
index df2597fc3e73ef35bb927b5aae60ea2d76f32c83..aba858825be1cb16fe05a3dc59687a309094b68e 100644 (file)
--- a/lib/common/ns.c
+++ b/lib/common/ns.c
@@ -20,9 +20,6 @@
  */
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 
 static int init_graph(graph_t *);
 static void dfs_cutval(node_t * v, edge_t * par);

diff --git a/lib/common/output.c b/lib/common/output.c
index 475a3e6f1945f9c00bc57d9196e9b099baccae7b..9d99cfba114b947db8132f86874aaede4b95aeb6 100644 (file)
--- a/lib/common/output.c
+++ b/lib/common/output.c
@@ -15,10 +15,7 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include       "agxbuf.h"
+#include "agxbuf.h"
 
 static int e_arrows;           /* graph has edges with end arrows */
 static int s_arrows;           /* graph has edges with start arrows */

diff --git a/lib/common/postproc.c b/lib/common/postproc.c
index 1aed0cf3f18b24a977dfd8fb54f72bd748e42b79..9b82f0586a2f7379ff4207cf3beee8699d3f8412 100644 (file)
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -16,9 +16,6 @@
 
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 
 
 static int Rankdir;

diff --git a/lib/common/psusershape.c b/lib/common/psusershape.c
index 9c32208d96c7ead3a56c00ced294b08633e73a73..fa8ff968565874b0507b97b8e0a85480b019f17c 100644 (file)
--- a/lib/common/psusershape.c
+++ b/lib/common/psusershape.c
@@ -22,9 +22,6 @@
 #include <stdio.h>
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 
 static int N_EPSF_files;
 static Dict_t *EPSF_contents;

diff --git a/lib/common/routespl.c b/lib/common/routespl.c
index 701e2c9240595204409153fb8efd783650851e06..c5f2c062cee6eeafc26aae6d6372c1eaff4f624c 100644 (file)
--- a/lib/common/routespl.c
+++ b/lib/common/routespl.c
@@ -16,10 +16,7 @@
 
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include       "pathplan.h"
+#include "pathplan.h"
 
 #ifdef UNUSED
 static box *bs = NULL;

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index e58f9da57677309187533ca78f837b308912cab6..f73e701aae5a9e49aef454f94bbcf0abd61d2d6e 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -15,11 +15,8 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
-#include       "htmltable.h"
-#include       <limits.h>
+#include "htmltable.h"
+#include <limits.h>
 
 #ifndef DISABLE_CODEGENS
 extern codegen_t VRML_CodeGen;

diff --git a/lib/common/splines.c b/lib/common/splines.c
index 1849aef5df8702153181f79c674bfd71e1ba3b72..2545ba6b1c3d71b06f35b3750f47f4129b20a5f9 100644 (file)
--- a/lib/common/splines.c
+++ b/lib/common/splines.c
@@ -20,9 +20,6 @@
  */
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 
 static int debugleveln(edge_t* e, int i)
 {

diff --git a/lib/common/svgusershape.c b/lib/common/svgusershape.c
index cb05a5ea42fce0cb46db4e572f53d5214940de98..a4f3ecba93bcb078f79dd5f4789b0afbe4b35d33 100644 (file)
--- a/lib/common/svgusershape.c
+++ b/lib/common/svgusershape.c
@@ -15,9 +15,6 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
-#include "gvcint.h"
-#include "gvcproc.h"
 
 point svg_image_size(graph_t * g, char *shapeimagefile)
 {

diff --git a/lib/common/utils.c b/lib/common/utils.c
index c77357261f3a7e4114b031d112cd4bf1e5388288..89ec335f117e1746f704eb8bed70f41ad189b3cd 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -23,11 +23,8 @@
 #include <unistd.h>
 #endif
 
-#include "types.h"
-#include "graph.h"
+#include "render.h"
 #include "agxbuf.h"
-#include "memory.h"
-#include "utils.h"
 #include "htmltable.h"
 
 /*

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index dc48ac179b358812bf1000b6e980272f8eab1151..8fb37fe12bfbad9f9c064e9d1ec1cc884a7da4f1 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -14,13 +14,16 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include "render.h"
+#include "types.h"
+#include "graph.h"
+#include "const.h"
 #include "gvplugin.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 
 extern GVC_t *gvNEWcontext(char **info, char *user);
 extern char *gvUsername(void);
+extern int gvRenderJobs (GVC_t * gvc, graph_t * g);
 
 char *LibInfo[] = {
     "libgvc",          /* Program */

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index c78b2d18505bc40197f3176d3741a74f82d951df..5f9f563bfaf3439e6f8d9e61266e1f6d43845dac 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -33,7 +33,6 @@
 #include "types.h"
 
 #include "gvplugin_device.h"
-#include "gvplugin.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index b8b4ef8c728ec9fedccc9832116ec0776451da5a..b8142ff52dd430fd3ba3d8724aaccd0b09a6e0f2 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -15,7 +15,7 @@
 **********************************************************/
 
 #include "render.h"
-#include "gvplugin.h"
+#include "gvcjob.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 
@@ -501,6 +501,11 @@ static int toggle_fit_cb(GVJ_t * job)
     return 0;
 }
 
+static void gvevent_modify (GVJ_t * job, char *name, char *value)
+{
+    /* FIXME */
+}
+
 static void gvevent_delete (GVJ_t * job)
 {
     /* FIXME */
@@ -546,9 +551,9 @@ gvdevice_callbacks_t gvdevice_callbacks = {
     gvevent_button_press,
     gvevent_button_release,
     gvevent_motion,
+    gvevent_modify,
     gvevent_delete,
     gvevent_read,
     gvevent_layout,
     gvevent_render,
-    NULL,
 };

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index 6f9866f89b928abda7ae1972385b32f268e2a7d9..3270f92072eae9277efd168a7660626d07996cab 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -33,7 +33,6 @@
 #include "cdt.h"
 
 #include "gvplugin_layout.h"
-#include "gvplugin.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 73accfe439e8a7823a3beadca987e0e51afaacc9..511e45821893cad2a806229b0aafc2a8ce23771f 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -42,7 +42,6 @@
 #include "cdt.h"
 
 #include "gvplugin_render.h"
-#include "gvplugin.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 

diff --git a/lib/gvc/gvtextlayout.c b/lib/gvc/gvtextlayout.c
index 9365cf2c71b532333bb63fa280b8eea7877e26d8..df56824846e08f42f3878c9297ceb5ceb910038a 100644 (file)
--- a/lib/gvc/gvtextlayout.c
+++ b/lib/gvc/gvtextlayout.c
@@ -30,7 +30,6 @@
 #include "types.h"
 
 #include "gvplugin_textlayout.h"
-#include "gvplugin.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index 79d0b029e9d11f8297e7c7e02948955e90ca24a0..2ac2a0e8df15d9f099a094eff37b424f670d0deb 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -45,7 +45,6 @@
 #include "graph.h"
 
 #include "gvplugin_usershape.h"
-#include "gvplugin.h"
 #include "gvcint.h"
 #include "gvcproc.h"