make it possible to disable single-file includes by defining

[platform/upstream/glib.git] / glib / gtree.h

diff --git a/glib/gtree.h b/glib/gtree.h
index ef78028..1d852ec 100644 (file)
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -21,32 +21,45 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__G_LIB_H__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #ifndef __G_TREE_H__
 #define __G_TREE_H__
 
-#include <gnode.h>
+#include <glib/gnode.h>
 
 G_BEGIN_DECLS
 
 typedef struct _GTree  GTree;
 
-typedef gint   (*GTraverseFunc)        (gpointer  key,
-                                 gpointer  value,
-                                 gpointer  data);
+typedef gboolean (*GTraverseFunc) (gpointer  key,
+                                   gpointer  value,
+                                   gpointer  data);
 
 /* Balanced binary trees
  */
 GTree*   g_tree_new             (GCompareFunc      key_compare_func);
 GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          user_data);
+                                 gpointer          key_compare_data);
+GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
+                                 gpointer          key_compare_data,
+                                 GDestroyNotify    key_destroy_func,
+                                 GDestroyNotify    value_destroy_func);
 void     g_tree_destroy         (GTree            *tree);
 void     g_tree_insert          (GTree            *tree,
                                  gpointer          key,
                                  gpointer          value);
-void     g_tree_remove          (GTree            *tree,
+void     g_tree_replace         (GTree            *tree,
+                                 gpointer          key,
+                                 gpointer          value);
+gboolean g_tree_remove          (GTree            *tree,
+                                 gconstpointer     key);
+gboolean g_tree_steal           (GTree            *tree,
                                  gconstpointer     key);
 gpointer g_tree_lookup          (GTree            *tree,
                                  gconstpointer     key);
@@ -54,19 +67,23 @@ gboolean g_tree_lookup_extended (GTree            *tree,
                                  gconstpointer     lookup_key,
                                  gpointer         *orig_key,
                                  gpointer         *value);
+void     g_tree_foreach         (GTree            *tree,
+                                 GTraverseFunc    func,
+                                 gpointer         user_data);
+
+#ifndef G_DISABLE_DEPRECATED
 void     g_tree_traverse        (GTree            *tree,
                                  GTraverseFunc     traverse_func,
                                  GTraverseType     traverse_type,
-                                 gpointer          data);
+                                 gpointer          user_data);
+#endif /* G_DISABLE_DEPRECATED */
+
 gpointer g_tree_search          (GTree            *tree,
                                  GCompareFunc      search_func,
-                                 gconstpointer     data);
+                                 gconstpointer     user_data);
 gint     g_tree_height          (GTree            *tree);
 gint     g_tree_nnodes          (GTree            *tree);
 
-
-
 G_END_DECLS
 
 #endif /* __G_TREE_H__ */
-