summaryrefslogtreecommitdiff
path: root/gio/gmemoryoutputstream.c
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2013-06-11 00:29:58 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2013-06-24 14:18:01 +0100
commit32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d (patch)
tree3caf429cb269a3046af9512dbd7b9bee94381e6a /gio/gmemoryoutputstream.c
parentaba80eea6c2965ee253a675610bd31c3dc256419 (diff)
downloadglib-32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d.tar.gz
gio: Use the new private instance data declaration
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
Diffstat (limited to 'gio/gmemoryoutputstream.c')
-rw-r--r--gio/gmemoryoutputstream.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c
index 6576bdc68..07d7db2c3 100644
--- a/gio/gmemoryoutputstream.c
+++ b/gio/gmemoryoutputstream.c
@@ -119,6 +119,7 @@ static GSource *g_memory_output_stream_create_source (GPollableOutputStream
static void g_memory_output_stream_pollable_iface_init (GPollableOutputStreamInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GMemoryOutputStream, g_memory_output_stream, G_TYPE_OUTPUT_STREAM,
+ G_ADD_PRIVATE (GMemoryOutputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
g_memory_output_stream_seekable_iface_init);
G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_OUTPUT_STREAM,
@@ -131,8 +132,6 @@ g_memory_output_stream_class_init (GMemoryOutputStreamClass *klass)
GOutputStreamClass *ostream_class;
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GMemoryOutputStreamPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = g_memory_output_stream_set_property;
gobject_class->get_property = g_memory_output_stream_get_property;
@@ -326,9 +325,7 @@ g_memory_output_stream_seekable_iface_init (GSeekableIface *iface)
static void
g_memory_output_stream_init (GMemoryOutputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_MEMORY_OUTPUT_STREAM,
- GMemoryOutputStreamPrivate);
+ stream->priv = g_memory_output_stream_get_private (stream);
stream->priv->pos = 0;
stream->priv->valid_len = 0;
}