From: Alexander Larsson Date: Wed, 12 Dec 2007 14:33:20 +0000 (+0000) Subject: s/parent/parent_instance/ in GObjects X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ab7ff4c6a04a9c29e4f1e8cb3fd1f39610c58c37;p=dana%2Fcg-glib.git s/parent/parent_instance/ in GObjects 2007-12-12 Alexander Larsson * gbufferedinputstream.h: * gbufferedoutputstream.h: * gdatainputstream.h: * gdataoutputstream.h: * gdirectorymonitor.h: * gfileenumerator.h: * gfileinputstream.h: * gfilemonitor.h: * gfileoutputstream.h: * gfilterinputstream.h: * gfilteroutputstream.h: * ginputstream.h: * glocalfileinputstream.h: * glocalfileoutputstream.h: * gmemoryinputstream.h: * gmemoryoutputstream.h: * gnativevolumemonitor.h: * goutputstream.h: * gunixinputstream.h: * gunixoutputstream.h: * gvfs.h: * gvolumemonitor.h: s/parent/parent_instance/ in GObjects svn path=/trunk/; revision=6102 --- diff --git a/gio/ChangeLog b/gio/ChangeLog index 4180aa09..01508455 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,29 @@ +2007-12-12 Alexander Larsson + + * gbufferedinputstream.h: + * gbufferedoutputstream.h: + * gdatainputstream.h: + * gdataoutputstream.h: + * gdirectorymonitor.h: + * gfileenumerator.h: + * gfileinputstream.h: + * gfilemonitor.h: + * gfileoutputstream.h: + * gfilterinputstream.h: + * gfilteroutputstream.h: + * ginputstream.h: + * glocalfileinputstream.h: + * glocalfileoutputstream.h: + * gmemoryinputstream.h: + * gmemoryoutputstream.h: + * gnativevolumemonitor.h: + * goutputstream.h: + * gunixinputstream.h: + * gunixoutputstream.h: + * gvfs.h: + * gvolumemonitor.h: + s/parent/parent_instance/ in GObjects + 2007-12-12 Alexander Larsson * gdrive.h: diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h index cac5d186..8e9c1ea9 100644 --- a/gio/gbufferedinputstream.h +++ b/gio/gbufferedinputstream.h @@ -46,7 +46,7 @@ typedef struct _GBufferedInputStreamPrivate GBufferedInputStreamPrivate; struct _GBufferedInputStream { - GFilterInputStream parent; + GFilterInputStream parent_instance; /*< private >*/ GBufferedInputStreamPrivate *priv; diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h index 816f07e8..d47ecd0f 100644 --- a/gio/gbufferedoutputstream.h +++ b/gio/gbufferedoutputstream.h @@ -47,7 +47,7 @@ typedef struct _GBufferedOutputStreamPrivate GBufferedOutputStreamPrivate; struct _GBufferedOutputStream { - GFilterOutputStream parent; + GFilterOutputStream parent_instance; /*< protected >*/ GBufferedOutputStreamPrivate *priv; diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h index 3e04e29d..355752d2 100644 --- a/gio/gdatainputstream.h +++ b/gio/gdatainputstream.h @@ -48,7 +48,7 @@ typedef struct _GDataInputStreamPrivate GDataInputStreamPrivate; struct _GDataInputStream { - GBufferedInputStream parent; + GBufferedInputStream parent_instance; /*< private >*/ GDataInputStreamPrivate *priv; diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h index 643cbde2..c5d70437 100644 --- a/gio/gdataoutputstream.h +++ b/gio/gdataoutputstream.h @@ -38,7 +38,7 @@ G_BEGIN_DECLS /** * GDataOutputStream: - * @parent: a #GBufferedOutputStream. + * @parent_instance: a #GBufferedOutputStream. * * An implementation of #GBufferedOutputStream that allows for high-level * data manipulation of arbitrary data (including binary operations). @@ -49,7 +49,7 @@ typedef struct _GDataOutputStreamPrivate GDataOutputStreamPrivate; struct _GDataOutputStream { - GFilterOutputStream parent; + GFilterOutputStream parent_instance; /*< private >*/ GDataOutputStreamPrivate *priv; diff --git a/gio/gdirectorymonitor.h b/gio/gdirectorymonitor.h index 709c006a..4425f7dd 100644 --- a/gio/gdirectorymonitor.h +++ b/gio/gdirectorymonitor.h @@ -41,13 +41,13 @@ typedef struct _GDirectoryMonitorPrivate GDirectoryMonitorPrivate; /** * GDirectoryMonitor: - * @parent: The parent class. + * @parent_instance: The parent class. * * Implements a monitor on the given #GFile that points to a directory. **/ struct _GDirectoryMonitor { - GObject parent; + GObject parent_instance; /*< private >*/ GDirectoryMonitorPrivate *priv; diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h index 2126920c..ffec2dd7 100644 --- a/gio/gfileenumerator.h +++ b/gio/gfileenumerator.h @@ -41,7 +41,7 @@ G_BEGIN_DECLS /** * GFileEnumerator: - * @parent: The parent class. + * @parent_instance: The parent class. * * A per matched file iterator. **/ @@ -52,7 +52,7 @@ typedef struct _GFileEnumeratorPrivate GFileEnumeratorPrivate; struct _GFileEnumerator { - GObject parent; + GObject parent_instance; /*< private >*/ GFileEnumeratorPrivate *priv; diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h index c737f4f5..77e7f9f8 100644 --- a/gio/gfileinputstream.h +++ b/gio/gfileinputstream.h @@ -49,7 +49,7 @@ typedef struct _GFileInputStreamPrivate GFileInputStreamPrivate; struct _GFileInputStream { - GInputStream parent; + GInputStream parent_instance; /*< private >*/ GFileInputStreamPrivate *priv; diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h index 42171c9d..0fb4f2bb 100644 --- a/gio/gfilemonitor.h +++ b/gio/gfilemonitor.h @@ -67,7 +67,7 @@ typedef struct _GFileMonitorPrivate GFileMonitorPrivate; **/ struct _GFileMonitor { - GObject parent; + GObject parent_instance; /*< private >*/ GFileMonitorPrivate *priv; diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h index a31f25f7..b6982b51 100644 --- a/gio/gfileoutputstream.h +++ b/gio/gfileoutputstream.h @@ -49,7 +49,7 @@ typedef struct _GFileOutputStreamPrivate GFileOutputStreamPrivate; struct _GFileOutputStream { - GOutputStream parent; + GOutputStream parent_instance; /*< private >*/ GFileOutputStreamPrivate *priv; diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h index e71231b4..f8e82db4 100644 --- a/gio/gfilterinputstream.h +++ b/gio/gfilterinputstream.h @@ -46,7 +46,7 @@ typedef struct _GFilterInputStreamPrivate GFilterInputStreamPrivate; struct _GFilterInputStream { - GInputStream parent; + GInputStream parent_instance; /**/ GInputStream *base_stream; diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h index e676632f..124046ec 100644 --- a/gio/gfilteroutputstream.h +++ b/gio/gfilteroutputstream.h @@ -46,7 +46,7 @@ typedef struct _GFilterOutputStreamPrivate GFilterOutputStreamPrivate; struct _GFilterOutputStream { - GOutputStream parent; + GOutputStream parent_instance; /*< protected >*/ GOutputStream *base_stream; diff --git a/gio/ginputstream.h b/gio/ginputstream.h index b730a2bd..8966136d 100644 --- a/gio/ginputstream.h +++ b/gio/ginputstream.h @@ -48,7 +48,7 @@ typedef struct _GInputStreamPrivate GInputStreamPrivate; struct _GInputStream { - GObject parent; + GObject parent_instance; /*< private >*/ GInputStreamPrivate *priv; diff --git a/gio/glocalfileinputstream.h b/gio/glocalfileinputstream.h index 3e01f16f..ac6469d9 100644 --- a/gio/glocalfileinputstream.h +++ b/gio/glocalfileinputstream.h @@ -40,7 +40,7 @@ typedef struct _GLocalFileInputStreamPrivate GLocalFileInputStreamPrivate; struct _GLocalFileInputStream { - GFileInputStream parent; + GFileInputStream parent_instance; /*< private >*/ GLocalFileInputStreamPrivate *priv; diff --git a/gio/glocalfileoutputstream.h b/gio/glocalfileoutputstream.h index 45662ca5..0c057df0 100644 --- a/gio/glocalfileoutputstream.h +++ b/gio/glocalfileoutputstream.h @@ -41,7 +41,7 @@ typedef struct _GLocalFileOutputStreamPrivate GLocalFileOutputStreamPrivate; struct _GLocalFileOutputStream { - GFileOutputStream parent; + GFileOutputStream parent_instance; /*< private >*/ GLocalFileOutputStreamPrivate *priv; diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h index 3f39b0c1..d2449122 100644 --- a/gio/gmemoryinputstream.h +++ b/gio/gmemoryinputstream.h @@ -46,7 +46,7 @@ typedef struct _GMemoryInputStreamPrivate GMemoryInputStreamPrivate; struct _GMemoryInputStream { - GInputStream parent; + GInputStream parent_instance; /*< private >*/ GMemoryInputStreamPrivate *priv; diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h index 5fc32f38..56d77bf5 100644 --- a/gio/gmemoryoutputstream.h +++ b/gio/gmemoryoutputstream.h @@ -46,7 +46,7 @@ typedef struct _GMemoryOutputStreamPrivate GMemoryOutputStreamPrivate; struct _GMemoryOutputStream { - GOutputStream parent; + GOutputStream parent_instance; /*< private >*/ GMemoryOutputStreamPrivate *priv; diff --git a/gio/gnativevolumemonitor.h b/gio/gnativevolumemonitor.h index 688e98ef..0b193ffd 100644 --- a/gio/gnativevolumemonitor.h +++ b/gio/gnativevolumemonitor.h @@ -16,7 +16,7 @@ typedef struct _GNativeVolumeMonitor GNativeVolumeMonitor; typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass; struct _GNativeVolumeMonitor { - GVolumeMonitor parent; + GVolumeMonitor parent_instance; }; struct _GNativeVolumeMonitorClass { diff --git a/gio/goutputstream.h b/gio/goutputstream.h index b617c7ef..4977d7dc 100644 --- a/gio/goutputstream.h +++ b/gio/goutputstream.h @@ -67,7 +67,7 @@ typedef struct _GOutputStreamPrivate GOutputStreamPrivate; struct _GOutputStream { - GObject parent; + GObject parent_instance; /*< private >*/ GOutputStreamPrivate *priv; diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h index 0a632271..4eeaa416 100644 --- a/gio/gunixinputstream.h +++ b/gio/gunixinputstream.h @@ -45,7 +45,7 @@ typedef struct _GUnixInputStreamPrivate GUnixInputStreamPrivate; struct _GUnixInputStream { - GInputStream parent; + GInputStream parent_instance; /*< private >*/ GUnixInputStreamPrivate *priv; diff --git a/gio/gunixoutputstream.h b/gio/gunixoutputstream.h index 08043f43..83cad9e8 100644 --- a/gio/gunixoutputstream.h +++ b/gio/gunixoutputstream.h @@ -45,7 +45,7 @@ typedef struct _GUnixOutputStreamPrivate GUnixOutputStreamPrivate; struct _GUnixOutputStream { - GOutputStream parent; + GOutputStream parent_instance; /*< private >*/ GUnixOutputStreamPrivate *priv; diff --git a/gio/gvfs.h b/gio/gvfs.h index 21219aff..3abc9b42 100644 --- a/gio/gvfs.h +++ b/gio/gvfs.h @@ -44,7 +44,7 @@ typedef struct _GVfs GVfs; /* Dummy typedef */ typedef struct _GVfsClass GVfsClass; struct _GVfs { - GObject parent; + GObject parent_instance; }; struct _GVfsClass diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h index 46decc5e..787d414c 100644 --- a/gio/gvolumemonitor.h +++ b/gio/gvolumemonitor.h @@ -40,7 +40,7 @@ G_BEGIN_DECLS /** * GVolumeMonitor: - * @parent: The parent class. + * @parent_instance: The parent instance. * * A Volume Monitor that watches for volume events. **/ @@ -48,7 +48,7 @@ typedef struct _GVolumeMonitor GVolumeMonitor; typedef struct _GVolumeMonitorClass GVolumeMonitorClass; struct _GVolumeMonitor { - GObject parent; + GObject parent_instance; /*< private >*/ gpointer priv;