Simplified lots of code by using the {?} _WRAP_METHOD() syntax.

        * gio/src/application.[hg|ccg]:
        * gio/src/bufferedinputstream.[hg|ccg]:
        * gio/src/datainputstream.[hg|ccg]:
        * gio/src/dataoutputstream.[hg|ccg]:
        * gio/src/dbusconnection.[hg|ccg]:
        * gio/src/fileenumerator.[hg|ccg]:
        * gio/src/initable.[hg|ccg]:
        * gio/src/inputstream.[hg|ccg]:
        * gio/src/iostream.[hg|ccg]:
        * gio/src/outputstream.[hg|ccg]:
        * gio/src/resolver.[hg|ccg]:
        * gio/src/seekable.[hg|ccg]:
        * gio/src/socket.[hg|ccg]:
        * gio/src/socketaddressenumerator.[hg|ccg]:
        * gio/src/socketclient.[hg|ccg]: This relatively new gmmproc syntax lets
us avoid the manual implementations and declarations just to have
overloads without the Cancellable parameters.
        * gio/src/unixconnection.hg: This had no method overloads without
Cancellable parameters but now it does.

1 files changed, 7 insertions, 35 deletions

diff --git a/gio/src/datainputstream.hg b/gio/src/datainputstream.hg
index 9a9a9100..965d721d 100644
--- a/gio/src/datainputstream.hg
+++ b/gio/src/datainputstream.hg
@@ -50,47 +50,19 @@ public:
   _WRAP_METHOD(void set_newline_type(DataStreamNewlineType type), g_data_input_stream_set_newline_type)
   _WRAP_METHOD(DataStreamNewlineType get_newline_type() const, g_data_input_stream_get_newline_type)
 
-  _WRAP_METHOD(guchar read_byte(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_byte, errthrow)
+  _WRAP_METHOD(guchar read_byte(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_byte, errthrow)
 
-  /** non-cancellable version of read_byte()
-   */
-  guchar read_byte();
-
-  _WRAP_METHOD(gint16 read_int16(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_int16, errthrow)
-  /** non-cancellable version of read_int16()
-   */
-  gint16 read_int16();
+  _WRAP_METHOD(gint16 read_int16(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_int16, errthrow)
 
-  _WRAP_METHOD(guint16 read_uint16(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_uint16, errthrow)
+  _WRAP_METHOD(guint16 read_uint16(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_uint16, errthrow)
 
-//TODO: Real documentation:
-  /** non-cancellable version of read_uint16()
-   */
-  guint16 read_uint16();
+  _WRAP_METHOD(gint32 read_int32(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_int32, errthrow)
 
-  _WRAP_METHOD(gint32 read_int32(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_int32, errthrow)
+  _WRAP_METHOD(guint32 read_uint32(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_uint32, errthrow)
 
-  /** non-cancellable version of read_int32()
-   */
-  gint32 read_int32();
-
-  _WRAP_METHOD(guint32 read_uint32(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_uint32, errthrow)
-  /** non-cancellable version of read_uint32()
-   */
-  guint32 read_uint32();
-
-  _WRAP_METHOD(gint64 read_int64(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_int64, errthrow)
-
-  /** non-cancellable version of read_int64()
-   */
-  gint64 read_int64();
-
-  _WRAP_METHOD(guint64 read_uint64(const Glib::RefPtr<Cancellable>& cancellable), g_data_input_stream_read_uint64, errthrow)
-
-  /** non-cancellable version of read_uint64()
-   */
-  guint64 read_uint64();
+  _WRAP_METHOD(gint64 read_int64(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_int64, errthrow)
 
+  _WRAP_METHOD(guint64 read_uint64(const Glib::RefPtr<Cancellable>& cancellable{?}), g_data_input_stream_read_uint64, errthrow)
 
   //Note that we return a bool because we can't use std::string to distinguish between an empty string and a NULL.