glibmm r564 - in trunk: . gio/src tools/m4

[murrayc svn gnome org]

Author: murrayc
Date: Sat Feb  2 23:45:28 2008
New Revision: 564
URL: http://svn.gnome.org/viewvc/glibmm?rev=564&view=rev

Log:
2008-02-03  Murray Cumming  <murrayc murrayc com>

* tools/m4/convert_gio.m4:
* gio/src/bufferedinputstream.hg: Move a signal-specific conversion 
here, because these conversions are unusual and shouldn't be used by 
mistake elsewhere, and when they are next to the signal then it is 
more obvious why they take a reference (also fixed).

Modified:
   trunk/ChangeLog
   trunk/gio/src/bufferedinputstream.hg
   trunk/tools/m4/convert_gio.m4

Modified: trunk/gio/src/bufferedinputstream.hg
==============================================================================
--- trunk/gio/src/bufferedinputstream.hg	(original)
+++ trunk/gio/src/bufferedinputstream.hg	Sat Feb  2 23:45:28 2008
@@ -50,31 +50,37 @@
   gssize fill(gssize count, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-/**
- * Reads data into @stream's buffer asynchronously, up to @count size.
- * @io_priority can be used to prioritize reads. For the synchronous version of
- * this function, see fill().
- *
- * @param slot A #GAsyncReadyCallback.
- * @param count: the number of bytes to read
- * @param io_priority the I/O priority of the request.
- * @param cancellable Cancellable object
- **/
+  /** Reads data into the stream's buffer asynchronously, up to @a count size.
+   * @ia o_priority can be used to prioritize reads. For the synchronous version of
+   * this function, see fill().
+   *
+   * @param slot A AsyncReadyCallback.
+   * @param count The number of bytes to read.
+   * @param cancellable Cancellable object.
+   * @param io_priority the I/O priority of the request.
+   */
   void fill_async(const SlotAsyncReady& slot,
                   gssize count,
                   const Glib::RefPtr<Cancellable>& cancellable,
-                  int io_priority=G_PRIORITY_DEFAULT);
+                  int io_priority = G_PRIORITY_DEFAULT);
 
-  /** non-cancellable version of fill_async()
+  /** Reads data into the stream's buffer asynchronously, up to @a count size.
+   * @ia o_priority can be used to prioritize reads. For the synchronous version of
+   * this function, see fill().
+   *
+   * @param slot A AsyncReadyCallback.
+   * @param count The number of bytes to read.
+   * @param io_priority the I/O priority of the request.
    */
   void fill_async(const SlotAsyncReady& slot,
                   gssize count,
-                  int io_priority=G_PRIORITY_DEFAULT);
+                  int io_priority = G_PRIORITY_DEFAULT);
 
   _WRAP_METHOD(gssize fill_finish(const Glib::RefPtr<AsyncResult>& result), g_buffered_input_stream_fill_finish, errthrow)
 
   _WRAP_METHOD(int read_byte(const Glib::RefPtr<Cancellable>& cancellable), g_buffered_input_stream_read_byte, errthrow)
-  /** non-cancellable version of read_byte
+
+  /** Non-cancellable version of read_byte.
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   int read_byte();
@@ -82,7 +88,8 @@
   int read_byte(std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  protected:
+protected:
+#m4 _CONVERSION(`GCancellable*', `const Glib::RefPtr<Cancellable>&', `Glib::wrap($3, true)')
   _WRAP_VFUNC(gssize fill(gssize count, const Glib::RefPtr<Cancellable>& cancellable, GError** error), "fill")
   // TODO: wrap async vfuncs
 };

Modified: trunk/tools/m4/convert_gio.m4
==============================================================================
--- trunk/tools/m4/convert_gio.m4	(original)
+++ trunk/tools/m4/convert_gio.m4	Sat Feb  2 23:45:28 2008
@@ -31,7 +31,6 @@
 # Cancellable
 _CONVERSION(`const Glib::RefPtr<Cancellable>&',`GCancellable*',__CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`GCancellable*', `Glib::RefPtr<Cancellable>', `Glib::wrap($3)')
-_CONVERSION(`GCancellable*', `const Glib::RefPtr<Cancellable>&', `Glib::wrap($3)')
 
 
 # Drive