diff options
Diffstat (limited to 'src/libical-glib/i-cal-object.h.in')
| -rw-r--r-- | src/libical-glib/i-cal-object.h.in | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/src/libical-glib/i-cal-object.h.in b/src/libical-glib/i-cal-object.h.in index 19438fd4..9803b5c2 100644 --- a/src/libical-glib/i-cal-object.h.in +++ b/src/libical-glib/i-cal-object.h.in @@ -1,17 +1,7 @@ /* - * Copyright (C) 2015 William Yu <williamyu@gnome.org> + * SPDX-FileCopyrightText: 2015 William Yu <williamyu@gnome.org> * - * This library is free software: you can redistribute it and/or modify it - * under the terms of version 2.1. of the GNU Lesser General Public License - * as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 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, see <https://www.gnu.org/licenses/>. + * SPDX-License-Identifier: LGPL-2.1-only OR MPL-2.0 */ #if !defined (__LIBICAL_GLIB_H_INSIDE__) && !defined (LIBICAL_GLIB_COMPILATION) @@ -29,26 +19,8 @@ #define I_CAL_TYPE_OBJECT \ (i_cal_object_get_type ()) - -#define I_CAL_OBJECT(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), I_CAL_TYPE_OBJECT, ICalObject)) - -#define I_CAL_OBJECT_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), I_CAL_TYPE_OBJECT, ICalObjectClass)) - -#define I_CAL_IS_OBJECT(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), I_CAL_TYPE_OBJECT)) - -#define I_CAL_IS_OBJECT_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), I_CAL_TYPE_OBJECT)) - -#define I_CAL_OBJECT_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), I_CAL_TYPE_OBJECT, ICalObjectClass)) +LIBICAL_ICAL_EXPORT +G_DECLARE_DERIVABLE_TYPE(ICalObject, i_cal_object, I_CAL, OBJECT, GObject) G_BEGIN_DECLS /** @@ -56,22 +28,12 @@ G_BEGIN_DECLS * * This is an ICalObject instance struct. */ -typedef struct _ICalObject ICalObject; /** * ICalObjectClass: * * This is an ICalObject class struct. */ -typedef struct _ICalObjectClass ICalObjectClass; -typedef struct _ICalObjectPrivate ICalObjectPrivate; - -struct _ICalObject -{ - /*< private > */ - GObject parent; - ICalObjectPrivate *priv; -}; struct _ICalObjectClass { @@ -79,8 +41,6 @@ struct _ICalObjectClass GObjectClass parent_class; }; -LIBICAL_ICAL_EXPORT GType i_cal_object_get_type(void); - LIBICAL_ICAL_EXPORT gpointer i_cal_object_construct(GType object_type, gpointer native, GDestroyNotify native_destroy_func, |