X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=graph_list.h;h=e6b6888cdbf528724ac18a310dd8a70f9d8fcfd8;hb=e850a3c5fb03dcb0e8698e61db2fd01a845bc6cf;hp=f03122ac59f80078f9cff0c517b2fb857b605d3e;hpb=816c38cf8560599b827df4edc01227c4348162c3;p=collection4.git

diff --git a/graph_list.h b/graph_list.h
index f03122a..e6b6888 100644
--- a/graph_list.h
+++ b/graph_list.h
@@ -1,53 +1,27 @@
 #ifndef GRAPH_LIST_H
 #define GRAPH_LIST_H 1
 
-/*
- * Data types
- */
-struct graph_config_s;
-typedef struct graph_config_s graph_config_t;
-
-#include "graph_def.h"
-#include "graph_ident.h"
+#include "graph_types.h"
+#include "graph.h"
 #include "graph_instance.h"
-#include "utils_array.h"
-#include "oconfig.h"
-
-/*
- * Callback types
- */
-typedef int (*gl_cfg_callback) (graph_config_t *cfg,
-    void *user_data);
-
-typedef int (*gl_inst_callback) (graph_config_t *cfg,
-    graph_instance_t *inst, void *user_data);
 
 /*
  * Functions
  */
-int graph_config_add (const oconfig_item_t *ci);
-int graph_config_submit (void);
-
-int gl_graph_get_all (gl_cfg_callback callback,
-    void *user_data);
+int gl_add_graph (graph_config_t *cfg);
 
-graph_config_t *graph_get_selected (void);
+int gl_config_submit (void);
 
-int gl_graph_get_title (graph_config_t *cfg,
-    char *buffer, size_t buffer_size);
+graph_config_t *gl_graph_get_selected (void);
 
-graph_ident_t *gl_graph_get_selector (graph_config_t *cfg);
+int gl_graph_get_all (graph_callback_t callback, void *user_data);
 
-graph_instance_t *gl_graph_get_instances (graph_config_t *cfg);
-
-graph_def_t *gl_graph_get_defs (graph_config_t *cfg);
-
-int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def);
+int gl_graph_instance_get_all (graph_config_t *cfg, graph_inst_callback_t callback,
+    void *user_data);
 
-int gl_graph_instance_get_all (graph_config_t *cfg,
-    gl_inst_callback callback, void *user_data);
+int gl_instance_get_all (graph_inst_callback_t callback, void *user_data);
 
-int gl_instance_get_all (gl_inst_callback callback,
+int gl_search (const char *search, graph_inst_callback_t callback,
     void *user_data);
 
 int gl_update (void);