luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-04 08:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio: Use the new private instance data declaration

Browse Source 
Use the newly added macros, and remove the explicit calls to
g_type_class_add_private().

https://bugzilla.gnome.org/show_bug.cgi?id=700035
This commit is contained in:
Emmanuele Bassi
2013-06-11 00:29:58 +01:00
parent aba80eea6c
commit 32747def4b
76 changed files with 387 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gio/giostream.c
View File

@@ -30,8 +30,6 @@
#include "gasyncresult.h"
#include "gtask.h"
G_DEFINE_ABSTRACT_TYPE (GIOStream, g_io_stream, G_TYPE_OBJECT);
/**
* SECTION:giostream
* @short_description: Base class for implementing read/write streams
@@ -92,11 +90,7 @@ static gboolean g_io_stream_real_close_finish (GIOStream *stream,
GAsyncResult *result,
GError **error);
static void
g_io_stream_finalize (GObject *object)
{
G_OBJECT_CLASS (g_io_stream_parent_class)->finalize (object);
}
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GIOStream, g_io_stream, G_TYPE_OBJECT)
static void
g_io_stream_dispose (GObject *object)
@@ -114,9 +108,7 @@ g_io_stream_dispose (GObject *object)
static void
g_io_stream_init (GIOStream *stream)
{
stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
G_TYPE_IO_STREAM,
GIOStreamPrivate);
stream->priv = g_io_stream_get_private (stream);
}
static void
@@ -151,9 +143,6 @@ g_io_stream_class_init (GIOStreamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GIOStreamPrivate));
gobject_class->finalize = g_io_stream_finalize;
gobject_class->dispose = g_io_stream_dispose;
gobject_class->get_property = g_io_stream_get_property;