summaryrefslogtreecommitdiff
path: root/gobject
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2011-06-02 17:14:58 -0400
committerColin Walters <walters@verbum.org>2011-06-03 12:40:01 -0400
commit3bd3067ffc1617b2fe96498b18b68aa7f2644487 (patch)
treed47716f1abe6bde428825a949dcaaee45715b35c /gobject
parentd51198baad17f88e046300a9375619b4bffcd881 (diff)
gobject: Use _ prefixing in private headers over G_GNUC_INTERNAL in public headers
This helps out gtk-doc and g-ir-scanner, and also makes much clearer what's private versus public. https://bugzilla.gnome.org/show_bug.cgi?id=651745
Diffstat (limited to 'gobject')
-rw-r--r--gobject/gboxed.c2
-rw-r--r--gobject/genums.c3
-rw-r--r--gobject/gobject.c3
-rw-r--r--gobject/gparam.c2
-rw-r--r--gobject/gparamspecs.c3
-rw-r--r--gobject/gsignal.c4
-rw-r--r--gobject/gtype-private.h10
-rw-r--r--gobject/gtype.c18
-rw-r--r--gobject/gtype.h12
-rw-r--r--gobject/gvalue.c2
-rw-r--r--gobject/gvaluetransform.c3
-rw-r--r--gobject/gvaluetypes.c3
12 files changed, 34 insertions, 31 deletions
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index b095539f1..6fa8f2631 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -75,7 +75,7 @@ value_free (GValue *value)
}
void
-g_boxed_type_init (void)
+_g_boxed_type_init (void)
{
static const GTypeInfo info = {
0, /* class_size */
diff --git a/gobject/genums.c b/gobject/genums.c
index ab30bef67..4346508ae 100644
--- a/gobject/genums.c
+++ b/gobject/genums.c
@@ -26,6 +26,7 @@
#include <string.h>
#include "genums.h"
+#include "gtype-private.h"
#include "gvalue.h"
#include "gvaluecollector.h"
@@ -74,7 +75,7 @@ static gchar* value_flags_enum_lcopy_value (const GValue *value,
/* --- functions --- */
void
-g_enum_types_init (void)
+_g_enum_types_init (void)
{
static gboolean initialized = FALSE;
static const GTypeValueTable flags_enum_value_table = {
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 33c978592..da2965702 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -27,6 +27,7 @@
#include <signal.h>
#include "gobject.h"
+#include "gtype-private.h"
#include "gvaluecollector.h"
#include "gsignal.h"
#include "gparamspecs.h"
@@ -235,7 +236,7 @@ debug_objects_atexit (void)
#endif /* G_ENABLE_DEBUG */
void
-g_object_type_init (void)
+_g_object_type_init (void)
{
static gboolean initialized = FALSE;
static const GTypeFundamentalInfo finfo = {
diff --git a/gobject/gparam.c b/gobject/gparam.c
index bca47d225..383e3beaa 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -86,7 +86,7 @@ static gchar* value_param_lcopy_value (const GValue *value,
/* --- functions --- */
void
-g_param_type_init (void)
+_g_param_type_init (void)
{
static const GTypeFundamentalInfo finfo = {
(G_TYPE_FLAG_CLASSED |
diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
index f49936bc3..d1e3e887c 100644
--- a/gobject/gparamspecs.c
+++ b/gobject/gparamspecs.c
@@ -27,6 +27,7 @@
#include <string.h>
#include "gparamspecs.h"
+#include "gtype-private.h"
#include "gvaluecollector.h"
#include "gvaluearray.h"
@@ -1160,7 +1161,7 @@ param_variant_values_cmp (GParamSpec *pspec,
GType *g_param_spec_types = NULL;
void
-g_param_spec_types_init (void)
+_g_param_spec_types_init (void)
{
const guint n_types = 23;
GType type, *spec_types, *spec_types_bound;
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index c4375b111..649120b80 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -30,10 +30,10 @@
#include <signal.h>
#include "gsignal.h"
+#include "gtype-private.h"
#include "gbsearcharray.h"
#include "gvaluecollector.h"
#include "gvaluetypes.h"
-#include "gboxed.h"
#include "gobject.h"
#include "genums.h"
#include "gobject_trace.h"
@@ -765,7 +765,7 @@ signal_key_cmp (gconstpointer node1,
}
void
-g_signal_init (void)
+_g_signal_init (void)
{
SIGNAL_LOCK ();
if (!g_n_signal_nodes)
diff --git a/gobject/gtype-private.h b/gobject/gtype-private.h
index 664eb55c3..85b6c58ad 100644
--- a/gobject/gtype-private.h
+++ b/gobject/gtype-private.h
@@ -27,6 +27,16 @@
G_BEGIN_DECLS
+void _g_value_c_init (void); /* sync with gvalue.c */
+void _g_value_types_init (void); /* sync with gvaluetypes.c */
+void _g_enum_types_init (void); /* sync with genums.c */
+void _g_param_type_init (void); /* sync with gparam.c */
+void _g_boxed_type_init (void); /* sync with gboxed.c */
+void _g_object_type_init (void); /* sync with gobject.c */
+void _g_param_spec_types_init (void); /* sync with gparamspecs.c */
+void _g_value_transforms_init (void); /* sync with gvaluetransform.c */
+void _g_signal_init (void); /* sync with gsignal.c */
+
/* for gboxed.c */
gpointer _g_type_boxed_copy (GType type,
gpointer value);
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 8baa09886..d23bd2c9e 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -4321,7 +4321,7 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
G_WRITE_UNLOCK (&type_rw_lock);
- g_value_c_init ();
+ _g_value_c_init ();
/* G_TYPE_TYPE_PLUGIN
*/
@@ -4329,35 +4329,35 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
/* G_TYPE_* value types
*/
- g_value_types_init ();
+ _g_value_types_init ();
/* G_TYPE_ENUM & G_TYPE_FLAGS
*/
- g_enum_types_init ();
+ _g_enum_types_init ();
/* G_TYPE_BOXED
*/
- g_boxed_type_init ();
+ _g_boxed_type_init ();
/* G_TYPE_PARAM
*/
- g_param_type_init ();
+ _g_param_type_init ();
/* G_TYPE_OBJECT
*/
- g_object_type_init ();
+ _g_object_type_init ();
/* G_TYPE_PARAM_* pspec types
*/
- g_param_spec_types_init ();
+ _g_param_spec_types_init ();
/* Value Transformations
*/
- g_value_transforms_init ();
+ _g_value_transforms_init ();
/* Signal system
*/
- g_signal_init ();
+ _g_signal_init ();
G_UNLOCK (type_init_lock);
}
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 54befc814..22210d654 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -1661,18 +1661,6 @@ G_CONST_RETURN gchar* g_type_name_from_instance (GTypeInstance *instance);
G_CONST_RETURN gchar* g_type_name_from_class (GTypeClass *g_class);
-/* --- internal functions --- */
-G_GNUC_INTERNAL void g_value_c_init (void); /* sync with gvalue.c */
-G_GNUC_INTERNAL void g_value_types_init (void); /* sync with gvaluetypes.c */
-G_GNUC_INTERNAL void g_enum_types_init (void); /* sync with genums.c */
-G_GNUC_INTERNAL void g_param_type_init (void); /* sync with gparam.c */
-G_GNUC_INTERNAL void g_boxed_type_init (void); /* sync with gboxed.c */
-G_GNUC_INTERNAL void g_object_type_init (void); /* sync with gobject.c */
-G_GNUC_INTERNAL void g_param_spec_types_init (void); /* sync with gparamspecs.c */
-G_GNUC_INTERNAL void g_value_transforms_init (void); /* sync with gvaluetransform.c */
-G_GNUC_INTERNAL void g_signal_init (void); /* sync with gsignal.c */
-
-
/* --- implementation bits --- */
#ifndef G_DISABLE_CAST_CHECKS
# define _G_TYPE_CIC(ip, gt, ct) \
diff --git a/gobject/gvalue.c b/gobject/gvalue.c
index 573969cee..775747460 100644
--- a/gobject/gvalue.c
+++ b/gobject/gvalue.c
@@ -139,7 +139,7 @@ static GBSearchConfig transform_bconfig = {
/* --- functions --- */
void
-g_value_c_init (void)
+_g_value_c_init (void)
{
transform_array = g_bsearch_array_create (&transform_bconfig);
}
diff --git a/gobject/gvaluetransform.c b/gobject/gvaluetransform.c
index 825ba6f9c..1b7b4fdc3 100644
--- a/gobject/gvaluetransform.c
+++ b/gobject/gvaluetransform.c
@@ -22,6 +22,7 @@
#include <string.h>
#include "gvalue.h"
+#include "gtype-private.h"
#include "genums.h"
@@ -243,7 +244,7 @@ value_transform_flags_string (const GValue *src_value,
/* registration
*/
void
-g_value_transforms_init (void)
+_g_value_transforms_init (void)
{
/* some transformations are a bit questionable,
* we currently skip those
diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c
index 78c7266d4..df3ef54e0 100644
--- a/gobject/gvaluetypes.c
+++ b/gobject/gvaluetypes.c
@@ -28,6 +28,7 @@
#include <stdlib.h> /* qsort() */
#include "gvaluetypes.h"
+#include "gtype-private.h"
#include "gvaluecollector.h"
#include "gobject.h"
#include "gparam.h"
@@ -421,7 +422,7 @@ value_lcopy_variant (const GValue *value,
/* --- type initialization --- */
void
-g_value_types_init (void)
+_g_value_types_init (void)
{
GTypeInfo info = {
0, /* class_size */