X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gobject%2Fgvalue.h;h=b3f2872291bedcf9077c34041140e2b40175eaf5;hb=45a1c41e8cfdeb4edeb7a671b95e599a49c6c281;hp=fb41ffa422b469df290a0cefce0da0a5cfba6deb;hpb=5e4c5611ab37edf414239eb44f9765c2b678e9c4;p=platform%2Fupstream%2Fglib.git

diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index fb41ffa..b3f2872 100644
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.h
@@ -1,5 +1,5 @@
 /* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997, 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,27 +18,93 @@
  *
  * gvalue.h: generic GValue functions
  */
+#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
+#error "Only <glib-object.h> can be included directly."
+#endif
+
 #ifndef __G_VALUE_H__
 #define __G_VALUE_H__
 
-
 #include	<gobject/gtype.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* --- type macros --- */
-#define	G_TYPE_IS_VALUE(type)		(g_type_value_table_peek (type) != NULL)
-#define	G_IS_VALUE(value)		(G_TYPE_IS_VALUE (G_VALUE_TYPE (value))) /* FIXME */
-#define	G_VALUE_TYPE(value)		(G_TYPE_FROM_CLASS (value))
+/**
+ * G_TYPE_IS_VALUE:
+ * @type: A #GType value.
+ * 
+ * Checks whether the passed in type ID can be used for g_value_init().
+ * That is, this macro checks whether this type provides an implementation
+ * of the #GTypeValueTable functions required for a type to create a #GValue of.
+ * 
+ * Returns: Whether @type is suitable as a #GValue type.
+ */
+#define	G_TYPE_IS_VALUE(type)		(g_type_check_is_value_type (type))
+/**
+ * G_IS_VALUE:
+ * @value: A #GValue structure.
+ * 
+ * Checks if @value is a valid and initialized #GValue structure.
+ *
+ * Returns: %TRUE on success.
+ */
+#define	G_IS_VALUE(value)		(G_TYPE_CHECK_VALUE (value))
+/**
+ * G_VALUE_TYPE:
+ * @value: A #GValue structure.
+ * 
+ * Get the type identifier of @value.
+ *
+ * Returns: the #GType.
+ */
+#define	G_VALUE_TYPE(value)		(((GValue*) (value))->g_type)
+/**
+ * G_VALUE_TYPE_NAME:
+ * @value: A #GValue structure.
+ *
+ * Gets the the type name of @value. 
+ *
+ * Returns: the type name.
+ */
 #define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))
+/**
+ * G_VALUE_HOLDS:
+ * @value: A #GValue structure.
+ * @type: A #GType value.
+ * 
+ * Checks if @value holds (or contains) a value of @type.
+ * This macro will also check for @value != %NULL and issue a
+ * warning if the check fails.
+ *
+ * Returns: %TRUE if @value holds the @type.
+ */
+#define G_VALUE_HOLDS(value,type)	(G_TYPE_CHECK_VALUE_TYPE ((value), (type)))
 
 
 /* --- typedefs & structures --- */
-typedef void (*GValueExchange) (GValue	*value1,
-				GValue	*value2);
+/**
+ * GValueTransform:
+ * @src_value: Source value.
+ * @dest_value: Target value.
+ * 
+ * The type of value transformation functions which can be registered with
+ * g_value_register_transform_func().
+ */
+typedef void (*GValueTransform) (const GValue *src_value,
+				 GValue       *dest_value);
+/**
+ * GValue:
+ * 
+ * An opaque structure used to hold different types of values.
+ * The data within the structure has protected scope: it is accessible only
+ * to functions within a #GTypeValueTable structure, or implementations of
+ * the g_value_*() API. That is, code portions which implement new fundamental
+ * types.
+ * #GValue users can not make any assumptions about how data is stored
+ * within the 2 element @data union, and the @g_type member should
+ * only be accessed through the G_VALUE_TYPE() macro.
+ */
 struct _GValue
 {
   /*< private >*/
@@ -50,35 +116,44 @@ struct _GValue
     guint	v_uint;
     glong	v_long;
     gulong	v_ulong;
+    gint64      v_int64;
+    guint64     v_uint64;
     gfloat	v_float;
     gdouble	v_double;
     gpointer	v_pointer;
-  } data[4];
+  } data[2];
 };
 
 
 /* --- prototypes --- */
-void            g_value_init	   	(GValue       *value,
+GValue*         g_value_init	   	(GValue       *value,
 					 GType         g_type);
 void            g_value_copy    	(const GValue *src_value,
 					 GValue       *dest_value);
-gboolean	g_value_convert		(const GValue *src_value,
-					 GValue       *dest_value);
-void            g_value_reset   	(GValue       *value);
+GValue*         g_value_reset   	(GValue       *value);
 void            g_value_unset   	(GValue       *value);
+void		g_value_set_instance	(GValue	      *value,
+					 gpointer      instance);
+
+
+/* --- private --- */
+gboolean	g_value_fits_pointer	(const GValue *value);
+gpointer	g_value_peek_pointer	(const GValue *value);
 
 
 /* --- implementation details --- */
-gboolean g_values_exchange		(GValue       *value1,
-					 GValue       *value2);
-gboolean g_value_types_exchangable	(GType         value_type1,
-					 GType         value_type2);
-void     g_value_register_exchange_func	(GType         value_type1,
-					 GType         value_type2,
-					 GValueExchange func);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+gboolean g_value_type_compatible	(GType		 src_type,
+					 GType		 dest_type);
+gboolean g_value_type_transformable	(GType           src_type,
+					 GType           dest_type);
+gboolean g_value_transform		(const GValue   *src_value,
+					 GValue         *dest_value);
+void	g_value_register_transform_func	(GType		 src_type,
+					 GType		 dest_type,
+					 GValueTransform transform_func);
+#define G_VALUE_NOCOPY_CONTENTS		(1 << 27)
+
+
+G_END_DECLS
 
 #endif /* __G_VALUE_H__ */