glibmm r537 - in trunk: . gio gio/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Jan 23 09:41:47 2008
New Revision: 537
URL: http://svn.gnome.org/viewvc/glibmm?rev=537&view=rev

Log:
2008-01-23  Murray Cumming  <murrayc murrayc com>

* gio/src/Makefile_list_of_hg.am_fragment:
* gio/src/error.ccg:
* gio/src/error.hg: Wrapped GIOErrorEnum as Gio::Error exception.
(This is registered in wrap_init()), so that the correct exception 
is thrown.
* gio/giomm.h: Include error.h

Added:
   trunk/gio/src/error.ccg
      - copied, changed from r535, /trunk/gio/src/icon.ccg
   trunk/gio/src/error.hg
      - copied, changed from r535, /trunk/gio/src/icon.hg
Modified:
   trunk/ChangeLog
   trunk/gio/giomm.h
   trunk/gio/src/Makefile_list_of_hg.am_fragment

Modified: trunk/gio/giomm.h
==============================================================================
--- trunk/gio/giomm.h	(original)
+++ trunk/gio/giomm.h	Wed Jan 23 09:41:47 2008
@@ -23,6 +23,7 @@
 #include <giomm/asyncresult.h>
 #include <giomm/cancellable.h>
 #include <giomm/drive.h>
+#include <giomm/error.h>
 #include <giomm/fileattribute.h>
 #include <giomm/file.h>
 #include <giomm/fileicon.h>

Modified: trunk/gio/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- trunk/gio/src/Makefile_list_of_hg.am_fragment	(original)
+++ trunk/gio/src/Makefile_list_of_hg.am_fragment	Wed Jan 23 09:41:47 2008
@@ -5,7 +5,7 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = appinfo.hg asyncresult.hg cancellable.hg drive.hg file.hg fileattribute.hg \
+files_general_hg = appinfo.hg asyncresult.hg cancellable.hg drive.hg error.hg file.hg fileattribute.hg \
                    fileenumerator.hg fileicon.hg fileinfo.hg fileinputstream.hg fileoutputstream.hg \
 		   filemonitor.hg filterinputstream.hg \
                    icon.hg inputstream.hg loadableicon.hg mount.hg mountoperation.hg outputstream.hg \

Copied: trunk/gio/src/error.ccg (from r535, /trunk/gio/src/icon.ccg)
==============================================================================
--- /trunk/gio/src/icon.ccg	(original)
+++ trunk/gio/src/error.ccg	Wed Jan 23 09:41:47 2008
@@ -19,14 +19,7 @@
 
 #include <gio/gio.h>
 
-namespace Gio {
-
-bool
-Icon::equal(const Glib::RefPtr<Icon>& other) const
+namespace Gio
 {
-  return static_cast<bool>(
-    g_icon_equal(const_cast<GIcon*>(this->gobj()),
-                 const_cast<GIcon*>(other->gobj())));
-}
 
 } // namespace Gio

Copied: trunk/gio/src/error.hg (from r535, /trunk/gio/src/icon.hg)
==============================================================================
--- /trunk/gio/src/icon.hg	(original)
+++ trunk/gio/src/error.hg	Wed Jan 23 09:41:47 2008
@@ -27,34 +27,13 @@
 namespace Gio
 {
 
-/** This is a very minimal interface for icons. It provides functions for checking the equality of two icons and hashing of icons.
- * Glib::Icon does not provide the actual pixmap for the icon as this is out of GIO's scope. However implementations of Icon may contain the name of an 
- * icon (see ThemedIcon), or the path to an icon (see LoadableIcon).
- *
- * To obtain a hash of an Icon instance, see hash().
- *
- * To check if two Icon instances are equal, see equal().
- *
- * @newin2p16
- */
-class Icon : public Glib::Interface
-{
-  _CLASS_INTERFACE(Icon, GIcon, G_ICON, GIconIface)
-
-public:
-  _WRAP_METHOD(guint hash() const, g_icon_hash)
+//Note that GIOErrorEnum is not named GIOError in gio because there is already a GIOError in glib,
+//But we can have both Glib::Error and Gio::Error in C++.
 
-  _IGNORE(g_icon_equal)
-  // TODO: should this, and File's equal(), be virtual, in order to
-  // be available to derived classes?
-  bool equal(const Glib::RefPtr<Icon>& other) const;
-
-  _WRAP_VFUNC(guint hash() const, "hash")
+/** Exception class for giomm errors.
+ */
+_WRAP_GERROR(IOError, GIOErrorEnum, G_IO_ERROR, NO_GTYPE)
 
-  // TODO: also kind of related to equal() being virtual or not,
-  // do we need to have equal_vfunc()? Or rather, why would we want
-  // to have it generally...
-};
 
 } // namespace Gio