glibmm r510 - in trunk: . gio/src
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glibmm r510 - in trunk: . gio/src
- Date: Tue, 15 Jan 2008 13:46:10 +0000 (GMT)
Author: murrayc
Date: Tue Jan 15 13:46:09 2008
New Revision: 510
URL: http://svn.gnome.org/viewvc/glibmm?rev=510&view=rev
Log:
2008-01-15 Murray Cumming <murrayc murrayc com>
* gio/src/drive.ccg:
* gio/src/drive.hg:
* gio/src/file.ccg:
* gio/src/file.hg:
* gio/src/fileenumerator.ccg:
* gio/src/fileenumerator.hg:
* gio/src/fileinputstream.ccg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.ccg:
* gio/src/fileoutputstream.hg:
* gio/src/inputstream.ccg:
* gio/src/inputstream.hg:
* gio/src/outputstream.ccg:
* gio/src/outputstream.hg:
* gio/src/volume.ccg:
* gio/src/volume.hg: *_async() functions: Rearrange the parameters,
so the (optional) cancellable is always after the slot,
and so flags and io_priority are always at the end, so they can have
default values.
Modified:
trunk/ChangeLog
trunk/gio/src/drive.ccg
trunk/gio/src/drive.hg
trunk/gio/src/file.ccg
trunk/gio/src/file.hg
trunk/gio/src/fileenumerator.ccg
trunk/gio/src/fileenumerator.hg
trunk/gio/src/fileinputstream.ccg
trunk/gio/src/fileinputstream.hg
trunk/gio/src/fileoutputstream.ccg
trunk/gio/src/fileoutputstream.hg
trunk/gio/src/inputstream.ccg
trunk/gio/src/inputstream.hg
trunk/gio/src/outputstream.ccg
trunk/gio/src/outputstream.hg
trunk/gio/src/volume.ccg
trunk/gio/src/volume.hg
Modified: trunk/gio/src/drive.ccg
==============================================================================
--- trunk/gio/src/drive.ccg (original)
+++ trunk/gio/src/drive.ccg Tue Jan 15 13:46:09 2008
@@ -50,7 +50,7 @@
namespace Gio
{
-void Drive::eject(GMountUnmountFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot)
+void Drive::eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, GMountUnmountFlags flags)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -64,7 +64,7 @@
slot_copy);
}
-void Drive::eject(GMountUnmountFlags flags, const SlotAsyncReady& slot)
+void Drive::eject(const SlotAsyncReady& slot, GMountUnmountFlags flags)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/drive.hg
==============================================================================
--- trunk/gio/src/drive.hg (original)
+++ trunk/gio/src/drive.hg Tue Jan 15 13:46:09 2008
@@ -72,17 +72,17 @@
//TODO: Use MountUnmountFlags instead of GMountUnmountFlags - we need to wrap some more stuff to see where this should best be declared.
/** Ejects the drive.
+ * @param slot A callback which will be called when the eject is completed or canceled.
* @param flags Flags affecting the unmount if required for eject.
* @param cancellable A cancellable object which can be used to cancel the eject.
- * @param slot A callback which will be called when the eject is completed or canceled.
*/
- void eject(GMountUnmountFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, GMountUnmountFlags flags = G_MOUNT_UNMOUNT_NONE);
/** Ejects the drive.
- * @param flags Flags affecting the unmount if required for eject.
* @param slot A callback which will be called when the eject is completed.
+ * @param flags Flags affecting the unmount if required for eject.
*/
- void eject(GMountUnmountFlags flags, const SlotAsyncReady& slot);
+ void eject(const SlotAsyncReady& slot, GMountUnmountFlags flags = G_MOUNT_UNMOUNT_NONE);
_IGNORE(g_drive_eject)
_WRAP_METHOD(bool eject_finish(const Glib::RefPtr<AsyncResult>& result),
Modified: trunk/gio/src/file.ccg
==============================================================================
--- trunk/gio/src/file.ccg (original)
+++ trunk/gio/src/file.ccg Tue Jan 15 13:46:09 2008
@@ -170,9 +170,22 @@
}
void
-File::read_async(int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::read_async(const SlotAsyncReady& slot, int io_priority)
+{
+ // Create a copy of the slot.
+ // A pointer to it will be passed through the callback's data parameter
+ // and deleted in the callback.
+ SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
+
+ g_file_read_async(gobj(),
+ io_priority,
+ NULL,
+ &SignalProxy_async_callback,
+ slot_copy);
+}
+
+void
+File::read_async(const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -187,10 +200,7 @@
}
void
-File::append_to_async(FileCreateFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::append_to_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -206,9 +216,7 @@
}
void
-File::append_to_async(FileCreateFlags flags,
- int io_priority,
- const SlotAsyncReady& slot)
+File::append_to_async(const SlotAsyncReady& slot, FileCreateFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -224,10 +232,7 @@
}
void
-File::create_file_async(FileCreateFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::create_file_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -243,9 +248,7 @@
}
void
-File::create_file_async(FileCreateFlags flags,
- int io_priority,
- const SlotAsyncReady& slot)
+File::create_file_async(const SlotAsyncReady& slot, FileCreateFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -261,12 +264,7 @@
}
void
-File::replace_async(const std::string& etag,
- bool make_backup,
- FileCreateFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const std::string& etag, bool make_backup, FileCreateFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -284,11 +282,7 @@
}
void
-File::replace_async(const std::string& etag,
- bool make_backup,
- FileCreateFlags flags,
- int io_priority,
- const SlotAsyncReady& slot)
+File::replace_async(const SlotAsyncReady& slot, const std::string& etag, bool make_backup, FileCreateFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -306,11 +300,7 @@
}
void
-File::query_info_async(const std::string& attributes,
- FileQueryInfoFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::query_info_async(const std::string& attributes, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -327,10 +317,7 @@
}
void
-File::query_info_async(const std::string& attributes,
- FileQueryInfoFlags flags,
- int io_priority,
- const SlotAsyncReady& slot)
+File::query_info_async(const std::string& attributes, const SlotAsyncReady& slot, FileQueryInfoFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -347,11 +334,7 @@
}
void
-File::enumerate_children_async(const std::string& attributes,
- FileQueryInfoFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::enumerate_children_async(const std::string& attributes, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -368,10 +351,7 @@
}
void
-File::enumerate_children_async(const std::string& attributes,
- FileQueryInfoFlags flags,
- int io_priority,
- const SlotAsyncReady& slot)
+File::enumerate_children_async(const std::string& attributes, const SlotAsyncReady& slot, FileQueryInfoFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -388,10 +368,7 @@
}
void
-File::set_display_name_async(const std::string& display_name,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::set_display_name_async(const std::string& display_name, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -407,9 +384,7 @@
}
void
-File::set_display_name_async(const std::string& display_name,
- int io_priority,
- const SlotAsyncReady& slot)
+File::set_display_name_async(const std::string& display_name, const SlotAsyncReady& slot, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -589,11 +564,7 @@
}
void
-File::set_attributes_async(const Glib::RefPtr<FileInfo>& info,
- FileQueryInfoFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -610,10 +581,7 @@
}
void
-File::set_attributes_async(const Glib::RefPtr<FileInfo>& info,
- FileQueryInfoFlags flags,
- int io_priority,
- const SlotAsyncReady& slot)
+File::set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot, FileQueryInfoFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -762,8 +730,7 @@
}
void
-File::load_contents_async(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+File::load_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -791,9 +758,7 @@
}
void
-File::load_partial_contents_async(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotReadMore& slot_read_more,
- const SlotAsyncReady& slot_async_ready)
+File::load_partial_contents_async(const SlotReadMore& slot_read_more, const SlotAsyncReady& slot_async_ready, const Glib::RefPtr<Cancellable>& cancellable)
{
// Create a new pair which will hold copies of passed slots.
LoadPartialSlots* slots = new LoadPartialSlots();
Modified: trunk/gio/src/file.hg
==============================================================================
--- trunk/gio/src/file.hg (original)
+++ trunk/gio/src/file.hg Tue Jan 15 13:46:09 2008
@@ -165,10 +165,10 @@
g_file_read,
refreturn, constversion, errthrow)
+ //TODO: Documentation:
+ void read_async(const SlotAsyncReady& slot, int io_priority = G_PRIORITY_DEFAULT);
+ void read_async(const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_read_async)
- void read_async(int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileInputStream> read_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_read_finish,
@@ -195,22 +195,22 @@
* For more details, see append_to() which is the synchronous version of this call.
*
* When the operation is finished, @a slot will be called. You can then call append_to_finish() to get the result of the operation.
+ * @param slot A callback slot which will be called when the request is satisfied.
+ * @param cancellable A Cancellable object which can be used to cancel the operation.
* @param flags a set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
- * @param cancellable A Cancellable object which can be used to cancel the operation.
- * @param slot A callback slot which will be called when the request is satisfied.
*/
- void append_to_async(FileCreateFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void append_to_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = G_PRIORITY_DEFAULT);
/** Asynchronously opens the file for appending.
* For more details, see append_to() which is the synchronous version of this call.
*
* When the operation is finished, @a slot will be called. You can then call append_to_finish() to get the result of the operation.
+ * @param slot A callback slot which will be called when the request is satisfied.
* @param flags a set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
- * @param slot A callback slot which will be called when the request is satisfied.
*/
- void append_to_async(FileCreateFlags flags, int io_priority, const SlotAsyncReady& slot);
+ void append_to_async(const SlotAsyncReady& slot, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_append_to_async)
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> append_to_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -231,7 +231,7 @@
* @param cancellable A Cancellable object which can be used to cancel the operation.
* @param slot A callback slot which will be called when the request is satisfied.
*/
- void create_file_async(FileCreateFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void create_file_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = G_PRIORITY_DEFAULT);
/** Asynchronously creates a new file and returns an output stream for writing to it. The file must not already exist.
* For more details, see create() which is the synchronous version of this call.
@@ -242,7 +242,7 @@
* @param io_priority The I/O priority of the request.
* @param slot A callback slot which will be called when the request is satisfied.
*/
- void create_file_async(FileCreateFlags flags, int io_priority, const SlotAsyncReady& slot);
+ void create_file_async(const SlotAsyncReady& slot, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_create_async)
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> create_file_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -255,62 +255,63 @@
* For more details, see replace() which is the synchronous version of this call.
* When the operation is finished, @a slot will be called. You can then call replace_finish() to get the result of the operation.
*
- * @param etag An entity tag for the current GFile.
+ * @param slot A callback slot which will be called when the request is satisfied.
+ * @param cancellable A Cancellable object which can be used to cancel the operation.
+ * @param etag An entity tag for the current Gio::File.
* @param make_backup true if a backup of the existing file should be made.
* @param flags A set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
- * @param cancellable A Cancellable object which can be used to cancel the operation.
- * @param slot A callback slot which will be called when the request is satisfied.
*/
- void replace_async(const std::string& etag, bool make_backup, FileCreateFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = G_PRIORITY_DEFAULT);
/** Asyncronously overwrites the file, replacing the contents, possibly creating a backup copy of the file first.
* For more details, see replace() which is the synchronous version of this call.
* When the operation is finished, @a slot will be called. You can then call replace_finish() to get the result of the operation.
*
- * @param etag An entity tag for the current GFile.
+ * @param slot A callback slot which will be called when the request is satisfied.
+ * @param etag An entity tag for the current Gio::File.
* @param make_backup true if a backup of the existing file should be made.
* @param flags A set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
- * @param slot A callback slot which will be called when the request is satisfied.
*/
- void replace_async(const std::string& etag, bool make_backup, FileCreateFlags flags, int io_priority, const SlotAsyncReady& slot);
+ void replace_async(const SlotAsyncReady& slot, const std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_replace_async)
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> replace_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_replace_finish,
refreturn, errthrow)
+ //TOOD: Add a version without the Cancellable?
_WRAP_METHOD(Glib::RefPtr<FileInfo> query_info(const std::string& attributes, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_query_info,
refreturn, errthrow)
- _IGNORE(g_file_query_info_async)
/** Asynchronously gets the requested information about specified file. The result is a FileInfo object that contains key-value attributes (such as type or size for the file).
*
* For more details, see query_info(() which is the synchronous version of this call.
* When the operation is finished, @a slot will be called. You can then call query_info_finish() to get the result of the operation.
*
+ * @param slot A callback slot which will be called when the request is satisfied.
+ * @param cancellable A Cancellable object which can be used to cancel the operation.
* @param attributes An attribute query string.
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
- * @param cancellable A Cancellable object which can be used to cancel the operation.
- * @param slot A callback slot which will be called when the request is satisfied.
*/
- void query_info_async(const std::string& attributes, FileQueryInfoFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void query_info_async(const std::string& attributes, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = G_PRIORITY_DEFAULT);
/** Asynchronously gets the requested information about specified file. The result is a FileInfo object that contains key-value attributes (such as type or size for the file).
*
* For more details, see query_info(() which is the synchronous version of this call.
* When the operation is finished, @a slot will be called. You can then call query_info_finish() to get the result of the operation.
*
+ * @param slot A callback slot which will be called when the request is satisfied.
* @param attributes An attribute query string.
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
- * @param slot A callback slot which will be called when the request is satisfied.
*/
- void query_info_async(const std::string& attributes, FileQueryInfoFlags flags, int io_priority, const SlotAsyncReady& slot);
+ void query_info_async(const std::string& attributes, const SlotAsyncReady& slot, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = G_PRIORITY_DEFAULT);
+ _IGNORE(g_file_query_info_async)
_WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_query_info_finish,
@@ -337,7 +338,7 @@
* @param cancellable A Cancellable object which can be used to cancel the operation.
* @param slot A callback slot which will be called when the request is satisfied.
*/
- void enumerate_children_async(const std::string& attributes, FileQueryInfoFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void enumerate_children_async(const std::string& attributes, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = G_PRIORITY_DEFAULT);
/** Asynchronously gets the requested information about the files in a directory. The result is a GFileEnumerator object that will give out GFileInfo objects for all the files in the directory.
*
@@ -349,7 +350,7 @@
* @param io_priority The I/O priority of the request.
* @param slot A callback slot which will be called when the request is satisfied.
*/
- void enumerate_children_async(const std::string& attributes, FileQueryInfoFlags flags, int io_priority, const SlotAsyncReady& slot);
+ void enumerate_children_async(const std::string& attributes, const SlotAsyncReady& slot, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_enumerate_children_async)
_WRAP_METHOD(Glib::RefPtr<FileEnumerator> enumerate_children_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -361,25 +362,26 @@
refreturn, errthrow)
+ //TODO: Use ustring for the display name?
/** Asynchronously sets the display name for a given Gio::File. For the synchronous version of this function, see set_display_name().
* When the operation is finished, @a slot will be called. You can then call set_display_name_finish() to get the result of the operation.
*
* @param display_name A string.
- * @param io_priority The I/O priority of the request.
- * @param cancellable A Cancellable object which can be used to cancel the operation.
* @param slot A callback slot which will be called when the request is satisfied.
+ * @param cancellable A Cancellable object which can be used to cancel the operation.
+ * @param io_priority The I/O priority of the request.
*/
- void set_display_name_async(const std::string& display_name, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void set_display_name_async(const std::string& display_name, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
/** Asynchronously sets the display name for a given Gio::File. For the synchronous version of this function, see set_display_name().
* When the operation is finished, @a slot will be called. You can then call set_display_name_finish() to get the result of the operation.
*
* @param display_name A string.
- * @param io_priority The I/O priority of the request.
* @param slot A callback slot which will be called when the request is satisfied.
+ * @param io_priority The I/O priority of the request.
*/
- void set_display_name_async(const std::string& display_name, int io_priority, const SlotAsyncReady& slot);
+ void set_display_name_async(const std::string& display_name, const SlotAsyncReady& slot, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_set_display_name_async)
_WRAP_METHOD(Glib::RefPtr<File> set_display_name_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -459,7 +461,7 @@
* @param cancellable A Cancellable object which can be used to cancel the operation.
* @param slot A callback slot which will be called when the request is satisfied.
*/
- void set_attributes_async(const Glib::RefPtr<FileInfo>& info, FileQueryInfoFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = G_PRIORITY_DEFAULT);
/** Asynchronously sets the attributes of file with info.
*
@@ -471,7 +473,7 @@
* @param io_priority The I/O priority of the request.
* @param slot A callback slot which will be called when the request is satisfied.
*/
- void set_attributes_async(const Glib::RefPtr<FileInfo>& info, FileQueryInfoFlags flags, int io_priority, const SlotAsyncReady& slot);
+ void set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_set_attributes_async)
_IGNORE(g_file_set_attributes_finish) // takes GFileInfo**
@@ -616,10 +618,11 @@
g_file_load_contents,
errthrow)
- _IGNORE(g_file_load_contents_async)
- void load_contents_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ //TODO: Documentation:
+ void load_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
void load_contents_async(const SlotAsyncReady& slot);
+ _IGNORE(g_file_load_contents_async)
_WRAP_METHOD(bool load_contents_finish(const Glib::RefPtr<AsyncResult>& result, char** contents, gsize& length, char** etag_out),
g_file_load_contents_finish,
@@ -642,11 +645,11 @@
*
* When the operation is finished, @a slot will be called. You can then call load_partial_contents_finish() to get the result of the operation.
*
- * @param cancellable A Cancellable object which can be used to cancel the operation.
* @param slot_read_more A callback to receive partial data and to specify whether further data should be read.
* @param slot_async_ready A callback slot which will be called when the request is satisfied.
+ * @param cancellable A Cancellable object which can be used to cancel the operation.
*/
- void load_partial_contents_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotReadMore& slot_read_more, const SlotAsyncReady& slot_async_ready);
+ void load_partial_contents_async(const SlotReadMore& slot_read_more, const SlotAsyncReady& slot_async_ready, const Glib::RefPtr<Cancellable>& cancellable);
/** Reads the partial contents of a file.
* The @a slot_read_more callback slot should be used to stop reading from the file when appropriate. This operation can be finished by load_partial_contents_finish().
@@ -669,14 +672,16 @@
g_file_load_partial_contents_finish,
errthrow)
+ //TODO: Use std::string instead of char*? Rearrange parameters to use default values?
_WRAP_METHOD(void replace_contents(const char* contents, gsize length, const char* etag, bool make_backup, FileCreateFlags flags, char** new_etag, const Glib::RefPtr<Cancellable>& cancellable),
g_file_replace_contents,
errthrow)
+ //TODO: Use std::string instead of char*? Rearrange parameters to use default values?
- _IGNORE(g_file_replace_contents_async)
void replace_contents_async(const char* contents, gsize length, const char* etag, bool make_backup, FileCreateFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
void replace_contents_async(const char* contents, gsize length, const char* etag, bool make_backup, FileCreateFlags flags, const SlotAsyncReady& slot);
+ _IGNORE(g_file_replace_contents_async)
_WRAP_METHOD(void replace_contents_finish(const Glib::RefPtr<AsyncResult>& result, char** new_etag),
g_file_replace_contents_finish,
Modified: trunk/gio/src/fileenumerator.ccg
==============================================================================
--- trunk/gio/src/fileenumerator.ccg (original)
+++ trunk/gio/src/fileenumerator.ccg Tue Jan 15 13:46:09 2008
@@ -50,10 +50,7 @@
namespace Gio {
void
-FileEnumerator::next_files_async(int num_files,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+FileEnumerator::next_files_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int num_files, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -69,9 +66,7 @@
}
void
-FileEnumerator::next_files_async(int num_files,
- int io_priority,
- const SlotAsyncReady& slot)
+FileEnumerator::next_files_async(const SlotAsyncReady& slot, int num_files, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/fileenumerator.hg
==============================================================================
--- trunk/gio/src/fileenumerator.hg (original)
+++ trunk/gio/src/fileenumerator.hg Tue Jan 15 13:46:09 2008
@@ -72,15 +72,12 @@
*
* Any outstanding I/O request with higher priority (lower numerical value) will be executed before an outstanding request with lower priority.
* The default priority is PRIORITY_DEFAULT.
+ * @param slot A callback to call when the request is satisfied.
+ * @param cancellable An cancellable object which can be used to cancel the request.
* @param num_files The number of file info objects to request.
* @param io_priority The I/O priority of the request.
- * @param cancellable An cancellable object which can be used to cancel the request.
- * @param slot A callback to call when the request is satisfied.
*/
- void next_files_async(int num_files,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void next_files_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int num_files = 1, int io_priority = G_PRIORITY_DEFAULT);
/** Request information for a number of files from the enumerator asynchronously.
* When all I/O for the operation is finished the callback slot will be called with the requested information.
@@ -93,13 +90,11 @@
*
* Any outstanding I/O request with higher priority (lower numerical value) will be executed before an outstanding request with lower priority.
* The default priority is PRIORITY_DEFAULT.
+ * @param slot A callback to call when the request is satisfied.
* @param num_files The number of file info objects to request.
* @param io_priority The I/O priority of the request.
- * @param slot A callback to call when the request is satisfied.
*/
- void next_files_async(int num_files,
- int io_priority,
- const SlotAsyncReady& slot);
+ void next_files_async(const SlotAsyncReady& slot, int num_files = 1, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_enumerator_next_files_async)
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<FileInfo> > next_files_finish(const Glib::RefPtr<AsyncResult>& result),
Modified: trunk/gio/src/fileinputstream.ccg
==============================================================================
--- trunk/gio/src/fileinputstream.ccg (original)
+++ trunk/gio/src/fileinputstream.ccg Tue Jan 15 13:46:09 2008
@@ -50,10 +50,7 @@
{
void
-FileInputStream::query_info_async(const std::string& attributes,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+FileInputStream::query_info_async(const std::string& attributes, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/fileinputstream.hg
==============================================================================
--- trunk/gio/src/fileinputstream.hg (original)
+++ trunk/gio/src/fileinputstream.hg Tue Jan 15 13:46:09 2008
@@ -55,6 +55,8 @@
errthrow)
+ //TODO: Add a version without the Cancellable?
+
/** Queries the stream information asynchronously. For the synchronous version of this function, see query_info().
*
* The operation can be cancelled by triggering the cancellable object from another thread. If the operation was cancelled, the error
@@ -63,14 +65,11 @@
* When the operation is finished, @a slot will be called. You can then call query_info_finish() to get the result of the operation.
*
* @param attributes A file attribute query string.
- * @param io_priority The I/O priority of the request.
- * @param cancellable A Cancellable object which can be used to cancel the operation.
* @param slot A callback slot which will be called when the request is satisfied.
+ * @param cancellable A Cancellable object which can be used to cancel the operation.
+ * @param io_priority The I/O priority of the request.
*/
- void query_info_async(const std::string& attributes,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void query_info_async(const std::string& attributes, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_file_input_stream_query_info_async)
_WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(const Glib::RefPtr<AsyncResult>& result),
Modified: trunk/gio/src/fileoutputstream.ccg
==============================================================================
--- trunk/gio/src/fileoutputstream.ccg (original)
+++ trunk/gio/src/fileoutputstream.ccg Tue Jan 15 13:46:09 2008
@@ -52,10 +52,7 @@
{
void
-FileOutputStream::query_info_async(const std::string& attributes,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+FileOutputStream::query_info_async(const std::string& attributes, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/fileoutputstream.hg
==============================================================================
--- trunk/gio/src/fileoutputstream.hg (original)
+++ trunk/gio/src/fileoutputstream.hg Tue Jan 15 13:46:09 2008
@@ -61,7 +61,7 @@
refreturn, errthrow)
_IGNORE(g_file_input_stream_query_info_async)
- void query_info_async(const std::string& attributes, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void query_info_async(const std::string& attributes, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
//TODO: cancellable can probably be NULL.
_WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -72,12 +72,14 @@
_WRAP_METHOD(goffset tell() const, g_file_output_stream_tell)
_WRAP_METHOD(bool can_seek() const, g_file_output_stream_can_seek)
+ //TODO: Add a default value for the seek type?
_WRAP_METHOD(bool seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable),
g_file_output_stream_seek,
errthrow)
//TODO: cancellable can probably be NULL.
_WRAP_METHOD(bool can_truncate() const, g_file_output_stream_can_truncate)
+
_WRAP_METHOD(bool truncate(goffset size, const Glib::RefPtr<Cancellable>& cancellable),
g_file_output_stream_truncate,
errthrow)
Modified: trunk/gio/src/inputstream.ccg
==============================================================================
--- trunk/gio/src/inputstream.ccg (original)
+++ trunk/gio/src/inputstream.ccg Tue Jan 15 13:46:09 2008
@@ -49,11 +49,7 @@
namespace Gio {
void
-InputStream::read_async(void* buffer,
- gsize count,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+InputStream::read_async(void* buffer, gsize count, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -70,10 +66,7 @@
}
void
-InputStream::skip_async(gsize count,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+InputStream::skip_async(gsize count, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -89,9 +82,7 @@
}
void
-InputStream::close_async(int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+InputStream::close_async(const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/inputstream.hg
==============================================================================
--- trunk/gio/src/inputstream.hg (original)
+++ trunk/gio/src/inputstream.hg Tue Jan 15 13:46:09 2008
@@ -59,23 +59,26 @@
g_input_stream_close,
errthrow)
- _IGNORE(g_input_stream_read_async)
- void read_async(void* buffer, gsize count, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ //TODO: Documentation.
+ void read_async(void* buffer, gsize count, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
+ _IGNORE(g_input_stream_read_async)
_WRAP_METHOD(gssize read_finish(const Glib::RefPtr<AsyncResult>& result),
g_input_stream_read_finish,
errthrow)
+ //TODO: Use std::size_type instead of gsize?
+ void skip_async(gsize count, const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_input_stream_skip_async)
- void skip_async(gsize count, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gssize skip_finish(const Glib::RefPtr<AsyncResult>& result),
g_input_stream_skip_finish,
errthrow)
+ //TODO: Can Cancellable be NULL?
+ void close_async(const SlotAsyncReady& slot, Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_input_stream_close_async)
- void close_async(int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gboolean close_finish(const Glib::RefPtr<AsyncResult>& result),
g_input_stream_close_finish,
Modified: trunk/gio/src/outputstream.ccg
==============================================================================
--- trunk/gio/src/outputstream.ccg (original)
+++ trunk/gio/src/outputstream.ccg Tue Jan 15 13:46:09 2008
@@ -50,11 +50,7 @@
namespace Gio {
void
-OutputStream::write_async(const void* buffer,
- gsize count,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+OutputStream::write_async(const void* buffer, gsize count, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -71,11 +67,7 @@
}
void
-OutputStream::splice_async(const Glib::RefPtr<InputStream>& source,
- OutputStreamSpliceFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+OutputStream::splice_async(const Glib::RefPtr<InputStream>& source, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, OutputStreamSpliceFlags flags, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -92,9 +84,7 @@
}
void
-OutputStream::flush_async(int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+OutputStream::flush_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -109,9 +99,7 @@
}
void
-OutputStream::close_async(int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+OutputStream::close_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/outputstream.hg
==============================================================================
--- trunk/gio/src/outputstream.hg (original)
+++ trunk/gio/src/outputstream.hg Tue Jan 15 13:46:09 2008
@@ -41,6 +41,7 @@
_CLASS_GOBJECT(OutputStream, GOutputStream, G_OUTPUT_STREAM, Glib::Object, GObject)
public:
+ //TODO: Can Cancellable be NULL?
_WRAP_METHOD(gssize write(const void* buffer, gsize count, const Glib::RefPtr<Cancellable>& cancellable),
g_output_stream_write,
errthrow)
@@ -61,29 +62,33 @@
g_output_stream_close,
errthrow)
+ //TODO: Can Cancellable be NULL?
+ void write_async(const void* buffer, gsize count, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_output_stream_write_async)
- void write_async(const void* buffer, gsize count, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gssize write_finish(const Glib::RefPtr<AsyncResult>& result),
g_output_stream_write_finish,
errthrow)
+ //TODO: Can Cancellable be NULL?
+ void splice_async(const Glib::RefPtr<InputStream>& source, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, OutputStreamSpliceFlags flags = OUTPUT_STREAM_SPLICE_NONE, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_output_stream_splice_async)
- void splice_async(const Glib::RefPtr<InputStream>& source, OutputStreamSpliceFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gssize splice_finish(const Glib::RefPtr<AsyncResult>& result),
g_output_stream_splice_finish,
errthrow)
+ //TODO: Can Cancellable be NULL?
+ void flush_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_output_stream_flush_async)
- void flush_async(int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(bool flush_finish(const Glib::RefPtr<AsyncResult>& result),
g_output_stream_flush_finish,
errthrow)
+ //TODO: Can Cancellable be NULL?
+ void close_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = G_PRIORITY_DEFAULT);
_IGNORE(g_output_stream_close_async)
- void close_async(int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(bool close_finish(const Glib::RefPtr<AsyncResult>& result),
g_output_stream_close_finish,
Modified: trunk/gio/src/volume.ccg
==============================================================================
--- trunk/gio/src/volume.ccg (original)
+++ trunk/gio/src/volume.ccg Tue Jan 15 13:46:09 2008
@@ -51,9 +51,7 @@
namespace Gio {
void
-Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot)
+Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,const Glib::RefPtr<Cancellable>& cancellable)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -69,8 +67,7 @@
}
void
-Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation,
- const SlotAsyncReady& slot)
+Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
@@ -84,7 +81,7 @@
slot_copy);
}
-void Volume::eject(GMountUnmountFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot)
+void Volume::eject(GMountUnmountFlags flags, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
{
// Create a copy of the slot.
// A pointer to it will be passed through the callback's data parameter
Modified: trunk/gio/src/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg (original)
+++ trunk/gio/src/volume.hg Tue Jan 15 13:46:09 2008
@@ -76,7 +76,7 @@
//TODO: Documentation.
- void mount(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot);
_IGNORE(g_volume_mount)
@@ -87,7 +87,7 @@
//TODO: Documentation.
//TODO: Use MountUnmountFlags instead of GMountUnmountFlags.
- void eject(GMountUnmountFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+ void eject(GMountUnmountFlags flags, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
void eject(GMountUnmountFlags flags, const SlotAsyncReady& slot);
_IGNORE(g_volume_eject)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
