From 7f0457c0438ec2f76a4c04e384c2f78e0ede9043 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Wed, 21 Aug 2019 00:16:46 +0200 Subject: logview-filter: avoid 'g_type_class_add_private' --- logview/src/logview-filter.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'logview') diff --git a/logview/src/logview-filter.c b/logview/src/logview-filter.c index 1a865fa8..91bfa3b2 100644 --- a/logview/src/logview-filter.c +++ b/logview/src/logview-filter.c @@ -30,21 +30,18 @@ enum { PROP_TEXTTAG }; -G_DEFINE_TYPE (LogviewFilter, logview_filter, G_TYPE_OBJECT); - struct _LogviewFilterPrivate { GRegex* regex; gchar* name; GtkTextTag* tag; }; -#define LOGVIEW_FILTER_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGVIEW_TYPE_FILTER, LogviewFilterPrivate)) +G_DEFINE_TYPE_WITH_PRIVATE (LogviewFilter, logview_filter, G_TYPE_OBJECT); static void logview_filter_init (LogviewFilter *object) { - object->priv = LOGVIEW_FILTER_GET_PRIVATE(object); + object->priv = logview_filter_get_instance_private (object); object->priv->tag = NULL; } @@ -154,9 +151,6 @@ logview_filter_class_init (LogviewFilterClass *klass) "The text tag to be set on matching lines", GTK_TYPE_TEXT_TAG, G_PARAM_READABLE | G_PARAM_WRITABLE)); - - - g_type_class_add_private (klass, sizeof (LogviewFilterPrivate)); } /* public methods */ -- cgit v1.2.1