GNOME.org
 

glibmm r544 - in trunk: . gio/src

Author: murrayc
Date: Sun Jan 27 07:06:56 2008
New Revision: 544
URL: http://svn.gnome.org/viewvc/glibmm?rev=544&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/gio/src/appinfo.hg
   trunk/gio/src/asyncresult.hg
   trunk/gio/src/cancellable.hg
   trunk/gio/src/drive.hg
   trunk/gio/src/error.hg
   trunk/gio/src/file.ccg
   trunk/gio/src/file.hg
   trunk/gio/src/fileattribute.hg
   trunk/gio/src/fileenumerator.hg
   trunk/gio/src/fileicon.hg
   trunk/gio/src/fileinfo.hg
   trunk/gio/src/fileinputstream.hg
   trunk/gio/src/fileoutputstream.hg
   trunk/gio/src/filterinputstream.hg
   trunk/gio/src/icon.hg
   trunk/gio/src/inputstream.hg
   trunk/gio/src/loadableicon.hg
   trunk/gio/src/mount.hg
   trunk/gio/src/mountoperation.hg
   trunk/gio/src/outputstream.hg
   trunk/gio/src/seekable.hg
   trunk/gio/src/simpleasyncresult.hg
   trunk/gio/src/volume.hg

Modified: trunk/gio/src/appinfo.hg
==============================================================================
--- trunk/gio/src/appinfo.hg	(original)
+++ trunk/gio/src/appinfo.hg	Sun Jan 27 07:06:56 2008
@@ -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 @@
 _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
 {
 

Modified: trunk/gio/src/asyncresult.hg
==============================================================================
--- trunk/gio/src/asyncresult.hg	(original)
+++ trunk/gio/src/asyncresult.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/cancellable.hg
==============================================================================
--- trunk/gio/src/cancellable.hg	(original)
+++ trunk/gio/src/cancellable.hg	Sun Jan 27 07:06:56 2008
@@ -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>
 

Modified: trunk/gio/src/drive.hg
==============================================================================
--- trunk/gio/src/drive.hg	(original)
+++ trunk/gio/src/drive.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/error.hg
==============================================================================
--- trunk/gio/src/error.hg	(original)
+++ trunk/gio/src/error.hg	Sun Jan 27 07:06:56 2008
@@ -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)

Modified: trunk/gio/src/file.ccg
==============================================================================
--- trunk/gio/src/file.ccg	(original)
+++ trunk/gio/src/file.ccg	Sun Jan 27 07:06:56 2008
@@ -22,7 +22,8 @@
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
 
-namespace {
+namespace
+{
 
 typedef std::pair<Gio::File::SlotReadMore*, Gio::SlotAsyncReady*> LoadPartialSlots;
 

Modified: trunk/gio/src/file.hg
==============================================================================
--- trunk/gio/src/file.hg	(original)
+++ trunk/gio/src/file.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/fileattribute.hg
==============================================================================
--- trunk/gio/src/fileattribute.hg	(original)
+++ trunk/gio/src/fileattribute.hg	Sun Jan 27 07:06:56 2008
@@ -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)

Modified: trunk/gio/src/fileenumerator.hg
==============================================================================
--- trunk/gio/src/fileenumerator.hg	(original)
+++ trunk/gio/src/fileenumerator.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/fileicon.hg
==============================================================================
--- trunk/gio/src/fileicon.hg	(original)
+++ trunk/gio/src/fileicon.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/fileinfo.hg
==============================================================================
--- trunk/gio/src/fileinfo.hg	(original)
+++ trunk/gio/src/fileinfo.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/fileinputstream.hg
==============================================================================
--- trunk/gio/src/fileinputstream.hg	(original)
+++ trunk/gio/src/fileinputstream.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/fileoutputstream.hg
==============================================================================
--- trunk/gio/src/fileoutputstream.hg	(original)
+++ trunk/gio/src/fileoutputstream.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/filterinputstream.hg
==============================================================================
--- trunk/gio/src/filterinputstream.hg	(original)
+++ trunk/gio/src/filterinputstream.hg	Sun Jan 27 07:06:56 2008
@@ -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>
 

Modified: trunk/gio/src/icon.hg
==============================================================================
--- trunk/gio/src/icon.hg	(original)
+++ trunk/gio/src/icon.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/inputstream.hg
==============================================================================
--- trunk/gio/src/inputstream.hg	(original)
+++ trunk/gio/src/inputstream.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/loadableicon.hg
==============================================================================
--- trunk/gio/src/loadableicon.hg	(original)
+++ trunk/gio/src/loadableicon.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/mount.hg
==============================================================================
--- trunk/gio/src/mount.hg	(original)
+++ trunk/gio/src/mount.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/mountoperation.hg
==============================================================================
--- trunk/gio/src/mountoperation.hg	(original)
+++ trunk/gio/src/mountoperation.hg	Sun Jan 27 07:06:56 2008
@@ -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)

Modified: trunk/gio/src/outputstream.hg
==============================================================================
--- trunk/gio/src/outputstream.hg	(original)
+++ trunk/gio/src/outputstream.hg	Sun Jan 27 07:06:56 2008
@@ -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>

Modified: trunk/gio/src/seekable.hg
==============================================================================
--- trunk/gio/src/seekable.hg	(original)
+++ trunk/gio/src/seekable.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
 

Modified: trunk/gio/src/simpleasyncresult.hg
==============================================================================
--- trunk/gio/src/simpleasyncresult.hg	(original)
+++ trunk/gio/src/simpleasyncresult.hg	Sun Jan 27 07:06:56 2008
@@ -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>
 

Modified: trunk/gio/src/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg	(original)
+++ trunk/gio/src/volume.hg	Sun Jan 27 07:06:56 2008
@@ -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
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]