projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Do not set body message if signature field is empty
[platform/upstream/glib.git]
/
gobject
/
gparamspecs.h
diff --git
a/gobject/gparamspecs.h
b/gobject/gparamspecs.h
index
e6f817d
..
7b6dd2a
100644
(file)
--- a/
gobject/gparamspecs.h
+++ b/
gobject/gparamspecs.h
@@
-12,19
+12,17
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* gparamspecs.h: GLib default param specs
*/
*
* gparamspecs.h: GLib default param specs
*/
+#ifndef __G_PARAMSPECS_H__
+#define __G_PARAMSPECS_H__
+
#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
#error "Only <glib-object.h> can be included directly."
#endif
#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
#error "Only <glib-object.h> can be included directly."
#endif
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
#include <gobject/gvalue.h>
#include <gobject/genums.h>
#include <gobject/gboxed.h>
#include <gobject/gvalue.h>
#include <gobject/genums.h>
#include <gobject/gboxed.h>
@@
-451,6
+449,8
@@
G_BEGIN_DECLS
* G_TYPE_PARAM_VALUE_ARRAY:
*
* The #GType of #GParamSpecValueArray.
* G_TYPE_PARAM_VALUE_ARRAY:
*
* The #GType of #GParamSpecValueArray.
+ *
+ * Deprecated: 2.32: Use #GArray instead of #GValueArray
*/
#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types[18])
/**
*/
#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types[18])
/**
@@
-460,6
+460,8
@@
G_BEGIN_DECLS
* Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VALUE_ARRAY.
*
* Returns: %TRUE on success.
* Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VALUE_ARRAY.
*
* Returns: %TRUE on success.
+ *
+ * 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))
/**
*/
#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
/**
@@
-467,6
+469,8
@@
G_BEGIN_DECLS
* @pspec: a valid #GParamSpec instance
*
* Cast a #GParamSpec instance into a #GParamSpecValueArray.
* @pspec: a valid #GParamSpec instance
*
* Cast a #GParamSpec instance into a #GParamSpecValueArray.
+ *
+ * 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))
*/
#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray))
@@
-971,6
+975,7
@@
struct _GParamSpecVariant
};
/* --- GParamSpec prototypes --- */
};
/* --- GParamSpec prototypes --- */
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_char (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_char (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-978,6
+983,7
@@
GParamSpec* g_param_spec_char (const gchar *name,
gint8 maximum,
gint8 default_value,
GParamFlags flags);
gint8 maximum,
gint8 default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_uchar (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_uchar (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-985,11
+991,13
@@
GParamSpec* g_param_spec_uchar (const gchar *name,
guint8 maximum,
guint8 default_value,
GParamFlags flags);
guint8 maximum,
guint8 default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_boolean (const gchar *name,
const gchar *nick,
const gchar *blurb,
gboolean default_value,
GParamFlags flags);
GParamSpec* g_param_spec_boolean (const gchar *name,
const gchar *nick,
const gchar *blurb,
gboolean default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_int (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_int (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-997,6
+1005,7
@@
GParamSpec* g_param_spec_int (const gchar *name,
gint maximum,
gint default_value,
GParamFlags flags);
gint maximum,
gint default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_uint (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_uint (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1004,6
+1013,7
@@
GParamSpec* g_param_spec_uint (const gchar *name,
guint maximum,
guint default_value,
GParamFlags flags);
guint maximum,
guint default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_long (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_long (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1011,6
+1021,7
@@
GParamSpec* g_param_spec_long (const gchar *name,
glong maximum,
glong default_value,
GParamFlags flags);
glong maximum,
glong default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_ulong (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_ulong (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1018,6
+1029,7
@@
GParamSpec* g_param_spec_ulong (const gchar *name,
gulong maximum,
gulong default_value,
GParamFlags flags);
gulong maximum,
gulong default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_int64 (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_int64 (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1025,6
+1037,7
@@
GParamSpec* g_param_spec_int64 (const gchar *name,
gint64 maximum,
gint64 default_value,
GParamFlags flags);
gint64 maximum,
gint64 default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_uint64 (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_uint64 (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1032,23
+1045,27
@@
GParamSpec* g_param_spec_uint64 (const gchar *name,
guint64 maximum,
guint64 default_value,
GParamFlags flags);
guint64 maximum,
guint64 default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_unichar (const gchar *name,
const gchar *nick,
const gchar *blurb,
gunichar default_value,
GParamFlags flags);
GParamSpec* g_param_spec_unichar (const gchar *name,
const gchar *nick,
const gchar *blurb,
gunichar default_value,
GParamFlags flags);
+GLIB_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);
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
GParamSpec* g_param_spec_flags (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType flags_type,
guint default_value,
GParamFlags flags);
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
GParamSpec* g_param_spec_float (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_float (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1056,6
+1073,7
@@
GParamSpec* g_param_spec_float (const gchar *name,
gfloat maximum,
gfloat default_value,
GParamFlags flags);
gfloat maximum,
gfloat default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_double (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_double (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1063,42
+1081,51
@@
GParamSpec* g_param_spec_double (const gchar *name,
gdouble maximum,
gdouble default_value,
GParamFlags flags);
gdouble maximum,
gdouble default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_string (const gchar *name,
const gchar *nick,
const gchar *blurb,
const gchar *default_value,
GParamFlags flags);
GParamSpec* g_param_spec_string (const gchar *name,
const gchar *nick,
const gchar *blurb,
const gchar *default_value,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_param (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType param_type,
GParamFlags flags);
GParamSpec* g_param_spec_param (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType param_type,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_boxed (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType boxed_type,
GParamFlags flags);
GParamSpec* g_param_spec_boxed (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType boxed_type,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_pointer (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamFlags flags);
GParamSpec* g_param_spec_pointer (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_value_array (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec *element_spec,
GParamFlags flags);
GParamSpec* g_param_spec_value_array (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec *element_spec,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_object (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType object_type,
GParamFlags flags);
GParamSpec* g_param_spec_object (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType object_type,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_override (const gchar *name,
GParamSpec *overridden);
GParamSpec* g_param_spec_override (const gchar *name,
GParamSpec *overridden);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_gtype (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType is_a_type,
GParamFlags flags);
GParamSpec* g_param_spec_gtype (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType is_a_type,
GParamFlags flags);
+GLIB_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_variant (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec* g_param_spec_variant (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@
-1126,7
+1153,7
@@
GParamSpec* g_param_spec_variant (const gchar *name,
# endif /* !GOBJECT_COMPILATION */
# endif /* !GOBJECT_STATIC_COMPILATION */
# else /* !G_PLATFORM_WIN32 */
# endif /* !GOBJECT_COMPILATION */
# endif /* !GOBJECT_STATIC_COMPILATION */
# else /* !G_PLATFORM_WIN32 */
-# define GOBJECT_VAR
extern
+# define GOBJECT_VAR
_GLIB_EXTERN
# endif /* !G_PLATFORM_WIN32 */
#endif /* GOBJECT_VAR */
# endif /* !G_PLATFORM_WIN32 */
#endif /* GOBJECT_VAR */