s/parent/parent_instance/ in GObjects

2007-12-12  Alexander Larsson  <alexl@redhat.com>

        * 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 4180aa09cbeef8fb50e317ae3d11e32839d57967..0150845560c6f5baaf505c71ebe4d28f44c5d1bd 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,29 @@
+2007-12-12  Alexander Larsson  <alexl@redhat.com>
+
+        * 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  <alexl@redhat.com>
 
         * gdrive.h:

diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h
index cac5d186c2bd378706aa96f03e5352cb4439a5b5..8e9c1ea9f998a16733a64025b376bb7d159b9066 100644 (file)
--- 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 816f07e87213d2a591178348163d22063c39f0f9..d47ecd0fce22b9e5a1220ce0763de4657e470597 100644 (file)
--- 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 3e04e29daa988aaceeaafcdfcc1a71ceb5774730..355752d2bc3a04f0cc52eac5571201b669c1e45b 100644 (file)
--- 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 643cbde204057403148cfc8ec64c679b6ef59bae..c5d7043708557d78e96a59dfbb03ec3edfeaae92 100644 (file)
--- 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 709c006a823184d112f4af4bbed43079ae163949..4425f7dd9d26eca37dfe32d10d69d4ca487997f0 100644 (file)
--- 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 2126920c44a1d3ccd7e114efb71edd82e1087373..ffec2dd78c261e31833f26da06c269ecbba80e6f 100644 (file)
--- 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 c737f4f5bf9c77b8f2d8bb7ab3bfb3e5340e4951..77e7f9f8dc175e5c6b00b21add0faa9f3976f186 100644 (file)
--- 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 42171c9d593ca4d18110e9bbe5ab1a95d927cf93..0fb4f2bb767a0eddc622ef5b4826559891f302c8 100644 (file)
--- 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 a31f25f79cd3711c9ea81f992d89e31bbe8c9a25..b6982b51a138496dd924fbe7a920444adcc6b281 100644 (file)
--- 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 e71231b409faa447d2882ffef5abda42d09dbe6d..f8e82db411934810695f6ba105a4f2484c834c14 100644 (file)
--- a/gio/gfilterinputstream.h
+++ b/gio/gfilterinputstream.h
@@ -46,7 +46,7 @@ typedef struct _GFilterInputStreamPrivate  GFilterInputStreamPrivate;
 
 struct _GFilterInputStream
 {
-  GInputStream parent;
+  GInputStream parent_instance;
 
   /*<protected >*/
   GInputStream *base_stream;

diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h
index e676632f4fba444408e8db1651ce6504c35ea70e..124046ec11396640f8891622b6d96db3c154bd3f 100644 (file)
--- 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 b730a2bdf77b83c95bf903c9bd2ab3eba9b05d3a..8966136d6246bb806611bd5f9b90beb1eabc709a 100644 (file)
--- 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 3e01f16f4c41c5f24ad8c97ec12222f38b07de5e..ac6469d920672b5ec2ab6fb169c9b1b9dcd47ad4 100644 (file)
--- 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 45662ca59448dc16a083822c3b90c140338c4943..0c057df085fa66b322b9ffb8ff03a4be31f72afc 100644 (file)
--- 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 3f39b0c184cc520bebd7a74804942b26eaf6943b..d2449122c2f512a7bb0b7eb943fa7ae4b3556bd4 100644 (file)
--- 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 5fc32f38a3b95e2ea79a56c5239988699f8d0224..56d77bf51b6f7ab88f92d88826e4e13c4541d7e6 100644 (file)
--- 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 688e98ef8b5e727af21eb8ecf1c7fa6cf396cf4c..0b193ffd944c720b9d03cb55347f834416f67283 100644 (file)
--- 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 b617c7ef7799c759373486e987c138ffccbc30b4..4977d7dc671adab00c11a5ffe781a47a2e060152 100644 (file)
--- 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 0a632271eeeedb18204a7ea15d5c7c6d57188076..4eeaa416663f0d484e206babfb6b1c2607cb4284 100644 (file)
--- 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 08043f431f4d2d2763ac7651b873973a76d07316..83cad9e8a0b89f01f9c9ca0f536b81aee49a98d3 100644 (file)
--- 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 21219afffb95d388b9000baefffa08e557d822f1..3abc9b425ad33ef776b678a856d875e74c48f6d7 100644 (file)
--- 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 46decc5e2a9e65e5a0651e5f12797d63fdaea221..787d414ca7101bf131022ede75dd7cb7db191fd1 100644 (file)
--- 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;