diff options
Diffstat (limited to 'gobject/gparamspecs.h')
| -rw-r--r-- | gobject/gparamspecs.h | 76 |
1 files changed, 26 insertions, 50 deletions
diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h index 250531eed..eaabc10dc 100644 --- a/gobject/gparamspecs.h +++ b/gobject/gparamspecs.h @@ -454,7 +454,7 @@ G_BEGIN_DECLS * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types[18]) GLIB_DEPRECATED_MACRO_IN_2_32 +#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types[18]) GOBJECT_DEPRECATED_MACRO_IN_2_32 /** * G_IS_PARAM_SPEC_VALUE_ARRAY: * @pspec: a valid #GParamSpec instance @@ -465,7 +465,7 @@ G_BEGIN_DECLS * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY)) GLIB_DEPRECATED_MACRO_IN_2_32 +#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY)) GOBJECT_DEPRECATED_MACRO_IN_2_32 /** * G_PARAM_SPEC_VALUE_ARRAY: * @pspec: a valid #GParamSpec instance @@ -474,7 +474,7 @@ G_BEGIN_DECLS * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray)) GLIB_DEPRECATED_MACRO_IN_2_32 +#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray)) GOBJECT_DEPRECATED_MACRO_IN_2_32 /** * G_TYPE_PARAM_OBJECT: @@ -986,7 +986,7 @@ struct _GParamSpecVariant }; /* --- GParamSpec prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_char (const gchar *name, const gchar *nick, const gchar *blurb, @@ -994,7 +994,7 @@ GParamSpec* g_param_spec_char (const gchar *name, gint8 maximum, gint8 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_uchar (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1002,13 +1002,13 @@ GParamSpec* g_param_spec_uchar (const gchar *name, guint8 maximum, guint8 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_boolean (const gchar *name, const gchar *nick, const gchar *blurb, gboolean default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_int (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1016,7 +1016,7 @@ GParamSpec* g_param_spec_int (const gchar *name, gint maximum, gint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_uint (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1024,7 +1024,7 @@ GParamSpec* g_param_spec_uint (const gchar *name, guint maximum, guint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_long (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1032,7 +1032,7 @@ GParamSpec* g_param_spec_long (const gchar *name, glong maximum, glong default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_ulong (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1040,7 +1040,7 @@ GParamSpec* g_param_spec_ulong (const gchar *name, gulong maximum, gulong default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_int64 (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1048,7 +1048,7 @@ GParamSpec* g_param_spec_int64 (const gchar *name, gint64 maximum, gint64 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_uint64 (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1056,27 +1056,27 @@ GParamSpec* g_param_spec_uint64 (const gchar *name, guint64 maximum, guint64 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_unichar (const gchar *name, const gchar *nick, const gchar *blurb, gunichar default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_enum (const gchar *name, const gchar *nick, const gchar *blurb, GType enum_type, gint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_flags (const gchar *name, const gchar *nick, const gchar *blurb, GType flags_type, guint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_float (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1084,7 +1084,7 @@ GParamSpec* g_param_spec_float (const gchar *name, gfloat maximum, gfloat default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_double (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1092,51 +1092,51 @@ GParamSpec* g_param_spec_double (const gchar *name, gdouble maximum, gdouble default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_string (const gchar *name, const gchar *nick, const gchar *blurb, const gchar *default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_param (const gchar *name, const gchar *nick, const gchar *blurb, GType param_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_boxed (const gchar *name, const gchar *nick, const gchar *blurb, GType boxed_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_pointer (const gchar *name, const gchar *nick, const gchar *blurb, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_value_array (const gchar *name, const gchar *nick, const gchar *blurb, GParamSpec *element_spec, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_object (const gchar *name, const gchar *nick, const gchar *blurb, GType object_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_override (const gchar *name, GParamSpec *overridden); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_gtype (const gchar *name, const gchar *nick, const gchar *blurb, GType is_a_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_variant (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1144,30 +1144,6 @@ GParamSpec* g_param_spec_variant (const gchar *name, GVariant *default_value, GParamFlags flags); -/* --- internal --- */ -/* We prefix variable declarations so they can - * properly get exported in windows dlls. - */ -#ifndef GOBJECT_VAR -# ifdef G_PLATFORM_WIN32 -# ifdef GOBJECT_STATIC_COMPILATION -# define GOBJECT_VAR extern -# else /* !GOBJECT_STATIC_COMPILATION */ -# ifdef GOBJECT_COMPILATION -# ifdef DLL_EXPORT -# define GOBJECT_VAR extern __declspec(dllexport) -# else /* !DLL_EXPORT */ -# define GOBJECT_VAR extern -# endif /* !DLL_EXPORT */ -# else /* !GOBJECT_COMPILATION */ -# define GOBJECT_VAR extern __declspec(dllimport) -# endif /* !GOBJECT_COMPILATION */ -# endif /* !GOBJECT_STATIC_COMPILATION */ -# else /* !G_PLATFORM_WIN32 */ -# define GOBJECT_VAR _GLIB_EXTERN -# endif /* !G_PLATFORM_WIN32 */ -#endif /* GOBJECT_VAR */ - GOBJECT_VAR GType *g_param_spec_types; G_END_DECLS |