Do not include gio.h from our public headers, to avoid polluting the

2008-01-27  Murray Cumming  <murrayc@murrayc.com>

* gio/src/appinfo.hg:
* gio/src/asyncresult.hg:
* gio/src/cancellable.hg:
* gio/src/drive.hg:
* gio/src/error.hg:
* gio/src/file.hg:
* gio/src/fileattribute.hg:
* gio/src/fileenumerator.hg:
* gio/src/fileicon.hg:
* gio/src/fileinfo.hg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.hg:
* gio/src/filterinputstream.hg:
* gio/src/icon.hg:
* gio/src/inputstream.hg:
* gio/src/loadableicon.hg:
* gio/src/mount.hg:
* gio/src/mountoperation.hg:
* gio/src/outputstream.hg:
* gio/src/seekable.hg:
* gio/src/simpleasyncresult.hg:
* gio/src/volume.hg: Do not include gio.h from our public headers, to 
avoid polluting the namespace.

svn path=/trunk/; revision=544

23 files changed, 44 insertions, 45 deletions

diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg
index 4afdb24e..f0046140 100644
--- a/gio/src/appinfo.hg
+++ b/gio/src/appinfo.hg
@@ -17,11 +17,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
 #include <exception>
 #endif
+
 #include <string>
 
 #include <glibmm/interface.h>
@@ -32,6 +31,10 @@ _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 _PINCLUDE(glibmm/private/object_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GAppInfoIface GAppInfoIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gio
 {
 
diff --git a/gio/src/asyncresult.hg b/gio/src/asyncresult.hg
index 65e5d41c..0bc6575f 100644
--- a/gio/src/asyncresult.hg
+++ b/gio/src/asyncresult.hg
@@ -17,16 +17,16 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-//#include <gio/gasyncresult.h> //We are not allowed to include individual headers.
-//TODO: Avoid this:
-#include <gio/gio.h>
-
 #include <glibmm/interface.h>
 #include <glibmm/object.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GAsyncResultIface GAsyncResultIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gio
 {
 
diff --git a/gio/src/cancellable.hg b/gio/src/cancellable.hg
index 7a90611b..7b383626 100644
--- a/gio/src/cancellable.hg
+++ b/gio/src/cancellable.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-//TODO: Avoid this:
-#include <gio/gio.h>
 
 #include <glibmm/object.h>
 
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 86225e67..520ddff6 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <giomm/mount.h>
 #include <giomm/icon.h>
 //#include <giomm/mountoperation.h>
@@ -26,6 +24,11 @@
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GDriveIface GDriveIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gio
 {
 
diff --git a/gio/src/error.hg b/gio/src/error.hg
index 09d4ad3c..14b2ac3e 100644
--- a/gio/src/error.hg
+++ b/gio/src/error.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/interface.h>
 
 _DEFS(giomm,gio)
diff --git a/gio/src/file.ccg b/gio/src/file.ccg
index 36795a33..ea5e1efa 100644
--- a/gio/src/file.ccg
+++ b/gio/src/file.ccg
@@ -22,7 +22,8 @@
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
 
-namespace {
+namespace
+{
 
 typedef std::pair<Gio::File::SlotReadMore*, Gio::SlotAsyncReady*> LoadPartialSlots;
 
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 99c18534..3038abc1 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-#include <string>
 #include <glibmm/error.h>
 #include <glibmm/interface.h>
 #include <giomm/asyncresult.h>
@@ -34,6 +32,10 @@
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GFileIface GFileIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gio
 {
 
diff --git a/gio/src/fileattribute.hg b/gio/src/fileattribute.hg
index 83c1709a..f1258a26 100644
--- a/gio/src/fileattribute.hg
+++ b/gio/src/fileattribute.hg
@@ -18,7 +18,7 @@
  */
 
 #include <string>
-#include <gio/gio.h>
+#include <gio/gio.h> //TODO: avoid this include
 #include <glibmm/object.h>
 
 _DEFS(giomm,gio)
diff --git a/gio/src/fileenumerator.hg b/gio/src/fileenumerator.hg
index aa1b3577..790934a4 100644
--- a/gio/src/fileenumerator.hg
+++ b/gio/src/fileenumerator.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/object.h>
 #include <glibmm/arrayhandle.h>
 #include <glibmm/listhandle.h>
diff --git a/gio/src/fileicon.hg b/gio/src/fileicon.hg
index dd151389..cd4f890e 100644
--- a/gio/src/fileicon.hg
+++ b/gio/src/fileicon.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/object.h>
 #include <giomm/file.h>
 #include <giomm/icon.h>
diff --git a/gio/src/fileinfo.hg b/gio/src/fileinfo.hg
index 4610c244..912cb35d 100644
--- a/gio/src/fileinfo.hg
+++ b/gio/src/fileinfo.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/arrayhandle.h>
 #include <glibmm/object.h>
 #include <glibmm/timeval.h>
diff --git a/gio/src/fileinputstream.hg b/gio/src/fileinputstream.hg
index 3d6d3534..1d57005c 100644
--- a/gio/src/fileinputstream.hg
+++ b/gio/src/fileinputstream.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <giomm/fileinfo.h>
 #include <giomm/inputstream.h>
 #include <giomm/seekable.h>
diff --git a/gio/src/fileoutputstream.hg b/gio/src/fileoutputstream.hg
index 3a9b1587..be63a91b 100644
--- a/gio/src/fileoutputstream.hg
+++ b/gio/src/fileoutputstream.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <giomm/outputstream.h>
 #include <giomm/seekable.h>
 #include <giomm/fileinfo.h>
diff --git a/gio/src/filterinputstream.hg b/gio/src/filterinputstream.hg
index 3ad09bad..5f2ca6ff 100644
--- a/gio/src/filterinputstream.hg
+++ b/gio/src/filterinputstream.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <giomm/inputstream.h>
 #include <glibmm/object.h>
 
diff --git a/gio/src/icon.hg b/gio/src/icon.hg
index b808e6a0..6c4dda2e 100644
--- a/gio/src/icon.hg
+++ b/gio/src/icon.hg
@@ -17,13 +17,15 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/interface.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GIconIface GIconIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gio
 {
 
diff --git a/gio/src/inputstream.hg b/gio/src/inputstream.hg
index 064d4d50..13d15118 100644
--- a/gio/src/inputstream.hg
+++ b/gio/src/inputstream.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/object.h>
 
 #include <giomm/asyncresult.h>
diff --git a/gio/src/loadableicon.hg b/gio/src/loadableicon.hg
index 02f40cb6..ac4c145c 100644
--- a/gio/src/loadableicon.hg
+++ b/gio/src/loadableicon.hg
@@ -17,13 +17,15 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/interface.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GLoadableIconIface GLoadableIconIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gio
 {
 
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index ce467af1..9d1371c7 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -22,12 +22,15 @@
 #include <giomm/volume.h>
 #include <glibmm/interface.h>
 
-#include <gio/gio.h>
-
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GMountIface GMountIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
 namespace Gio
 {
 
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index b381fa9d..e3bf510e 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/object.h>
 
 _DEFS(giomm,gio)
diff --git a/gio/src/outputstream.hg b/gio/src/outputstream.hg
index 2aad2cd3..b39d706b 100644
--- a/gio/src/outputstream.hg
+++ b/gio/src/outputstream.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/object.h>
 #include <giomm/asyncresult.h>
 #include <giomm/cancellable.h>
diff --git a/gio/src/seekable.hg b/gio/src/seekable.hg
index 227593c9..e9dbef55 100644
--- a/gio/src/seekable.hg
+++ b/gio/src/seekable.hg
@@ -17,13 +17,17 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
 #include <giomm/cancellable.h>
 #include <glibmm/interface.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GSeekableIface GSeekableIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
 namespace Gio
 {
 
diff --git a/gio/src/simpleasyncresult.hg b/gio/src/simpleasyncresult.hg
index 925660f2..a403d9b9 100644
--- a/gio/src/simpleasyncresult.hg
+++ b/gio/src/simpleasyncresult.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <glibmm/object.h>
 #include <giomm/asyncresult.h>
 
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index c998bfc5..1c3da814 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -17,8 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gio/gio.h>
-
 #include <giomm/file.h>
 #include <giomm/mountoperation.h>
 //#include <giomm/drive.h>
@@ -27,6 +25,11 @@
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+typedef struct _GVolumeIface GGVolumeIface;
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
 namespace Gio
 {