glibmm r491 - in trunk: . gio/src
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glibmm r491 - in trunk: . gio/src
- Date: Tue, 8 Jan 2008 15:17:44 +0000 (GMT)
Author: murrayc
Date: Tue Jan 8 15:17:44 2008
New Revision: 491
URL: http://svn.gnome.org/viewvc/glibmm?rev=491&view=rev
Log:
2008-01-08 Murray Cumming <murrayc murrayc com>
* gio/src/asyncresult.hg:
* gio/src/cancellable.hg:
* gio/src/fileattribute.hg:
* gio/src/fileenumerator.hg:
* gio/src/fileinputstream.hg:
* gio/src/fileoutputstream.hg:
* gio/src/icon.hg:
* gio/src/inputstream.hg:
* gio/src/mountoperation.hg:
* gio/src/outputstream.hg:
* gio/src/simpleasyncresult.hg:
Made some whitespace more consistent with the rest of glibmm.
In particular, white space alignment in .hg files will often be even worse
when seen in the generated .h files.
* gio/src/drive.hg: get_icon(),
* gio/src/file.hg: read(),
* gio/src/fileicon.hg: get_file(),
* gio/src/fileinfo.hg: get_icon(),
* gio/src/volume.hg: get_drive(), get_icon():
For the const versions, actually return a const RefPtr.
Modified:
trunk/ChangeLog
trunk/gio/src/asyncresult.hg
trunk/gio/src/cancellable.hg
trunk/gio/src/drive.hg
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/icon.hg
trunk/gio/src/inputstream.hg
trunk/gio/src/mountoperation.hg
trunk/gio/src/outputstream.hg
trunk/gio/src/simpleasyncresult.hg
trunk/gio/src/volume.hg
Modified: trunk/gio/src/asyncresult.hg
==============================================================================
--- trunk/gio/src/asyncresult.hg (original)
+++ trunk/gio/src/asyncresult.hg Tue Jan 8 15:17:44 2008
@@ -25,9 +25,20 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/interface_p.h)
-namespace Gio {
+namespace Gio
+{
class AsyncResult;
+
+/** A function that will be called when an asynchronous operation within GIO has been completed.
+ * @param result The asynchronous function's results.
+ *
+ * For instance,
+ * @code
+ * void on_async_ready(Glib::RefPtr<AsyncResult>& result);
+ * @endcode
+ */
+
typedef sigc::slot<void, Glib::RefPtr<AsyncResult>& > SlotAsyncReady;
class AsyncResult : public Glib::Interface
Modified: trunk/gio/src/cancellable.hg
==============================================================================
--- trunk/gio/src/cancellable.hg (original)
+++ trunk/gio/src/cancellable.hg Tue Jan 8 15:17:44 2008
@@ -24,7 +24,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
class Cancellable : public Glib::Object
{
@@ -51,11 +52,10 @@
_WRAP_METHOD(void push_current(),
g_cancellable_push_current)
-
_WRAP_METHOD(void pop_current(),
g_cancellable_pop_current)
-
_WRAP_METHOD(void reset(), g_cancellable_reset)
};
} // namespace Gio
+
Modified: trunk/gio/src/drive.hg
==============================================================================
--- trunk/gio/src/drive.hg (original)
+++ trunk/gio/src/drive.hg Tue Jan 8 15:17:44 2008
@@ -42,10 +42,9 @@
g_drive_get_icon,
refreturn)
- _WRAP_METHOD(Glib::RefPtr<Icon> get_icon() const,
+ _WRAP_METHOD(Glib::RefPtr<const Icon> get_icon() const,
g_drive_get_icon,
refreturn, constversion)
-
_WRAP_METHOD(bool has_volumes() const, g_drive_has_volumes)
// TODO: get_volumes, returns a list of GVolumes, we shouldn't take copy
@@ -70,3 +69,4 @@
};
} // namespace Gio
+
Modified: trunk/gio/src/file.hg
==============================================================================
--- trunk/gio/src/file.hg (original)
+++ trunk/gio/src/file.hg Tue Jan 8 15:17:44 2008
@@ -33,7 +33,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/interface_p.h)
-namespace Gio {
+namespace Gio
+{
_WRAP_ENUM(FileQueryInfoFlags, GFileQueryInfoFlags, NO_GTYPE)
_WRAP_ENUM(FileCreateFlags, GFileCreateFlags, NO_GTYPE)
@@ -99,25 +100,19 @@
_WRAP_METHOD(bool contains_file(const Glib::RefPtr<File>& descendant) const,
g_file_contains_file)
-
_WRAP_METHOD(std::string get_relative_path(const Glib::RefPtr<File>& descendant) const,
g_file_get_relative_path)
-
_WRAP_METHOD(Glib::RefPtr<File> resolve_relative_path(const std::string& relative_path) const,
g_file_resolve_relative_path)
-
_WRAP_METHOD(bool is_native() const, g_file_is_native)
-
_WRAP_METHOD(bool has_uri_scheme(const std::string& uri_scheme) const,
g_file_has_uri_scheme)
_WRAP_METHOD(std::string get_uri_scheme() const, g_file_get_uri_scheme)
-
_WRAP_METHOD(Glib::RefPtr<FileInputStream> read(const Glib::RefPtr<Cancellable>& cancellable),
g_file_read,
refreturn, errthrow)
-
- _WRAP_METHOD(Glib::RefPtr<FileInputStream> read(const Glib::RefPtr<Cancellable>& cancellable) const,
+ _WRAP_METHOD(Glib::RefPtr<const FileInputStream> read(const Glib::RefPtr<Cancellable>& cancellable) const,
g_file_read,
refreturn, constversion, errthrow)
@@ -129,134 +124,83 @@
_WRAP_METHOD(Glib::RefPtr<FileInputStream> read_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_read_finish,
refreturn, errthrow)
-
- _WRAP_METHOD(Glib::RefPtr<FileOutputStream> append_to(FileCreateFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<FileOutputStream> append_to(FileCreateFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_append_to,
refreturn, errthrow)
-
- _WRAP_METHOD(Glib::RefPtr<FileOutputStream> create(FileCreateFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<FileOutputStream> create(FileCreateFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_create,
refreturn, errthrow)
// TODO: see what etags are for. It seems that it can be null.
- _WRAP_METHOD(Glib::RefPtr<FileOutputStream> replace(const std::string& etag,
- bool make_backup,
- FileCreateFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<FileOutputStream> replace(const std::string& etag, bool make_backup, FileCreateFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_replace,
refreturn, errthrow)
_IGNORE(g_file_append_to_async)
- void append_to_async(FileCreateFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
-
- void append_to_async(FileCreateFlags flags,
- int io_priority,
- const SlotAsyncReady& slot);
+ void append_to_async(FileCreateFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+
+ void append_to_async(FileCreateFlags flags, int io_priority, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> append_to_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_append_to_finish,
refreturn, errthrow)
_IGNORE(g_file_create_async)
- void create_async(FileCreateFlags flags,
- int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
-
- void create_async(FileCreateFlags flags,
- int io_priority,
- const SlotAsyncReady& slot);
+ void create_async(FileCreateFlags flags, int io_priority, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+
+ void create_async(FileCreateFlags flags, int io_priority, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> create_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_create_finish,
refreturn, errthrow)
_IGNORE(g_file_replace_async)
- 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 std::string& etag,
- bool make_backup,
- FileCreateFlags flags,
- int io_priority,
- const SlotAsyncReady& slot);
+ 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 std::string& etag, bool make_backup, FileCreateFlags flags, int io_priority, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> replace_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_replace_finish,
refreturn, errthrow)
- _WRAP_METHOD(Glib::RefPtr<FileInfo> query_info(const std::string& attributes,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& 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)
- 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,
- FileQueryInfoFlags flags,
- int io_priority,
- const SlotAsyncReady& slot);
+ 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, FileQueryInfoFlags flags, int io_priority, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_query_info_finish,
refreturn, errthrow)
- _WRAP_METHOD(Glib::RefPtr<FileInfo> query_filesystem_info(const std::string& attributes,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<FileInfo> query_filesystem_info(const std::string& attributes, const Glib::RefPtr<Cancellable>& cancellable),
g_file_query_filesystem_info,
refreturn, errthrow)
- _WRAP_METHOD(Glib::RefPtr<FileEnumerator> enumerate_children(const std::string& attributes,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<FileEnumerator> enumerate_children(const std::string& attributes, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_enumerate_children,
errthrow)
_IGNORE(g_file_enumerate_children_async)
- 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,
- FileQueryInfoFlags flags,
- int io_priority,
- const SlotAsyncReady& slot);
+ 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, FileQueryInfoFlags flags, int io_priority, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileEnumerator> enumerate_children_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_enumerate_children_finish,
errthrow)
- _WRAP_METHOD(Glib::RefPtr<File> set_display_name(const std::string& display_name,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<File> set_display_name(const std::string& display_name, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_display_name,
refreturn, errthrow)
_IGNORE(g_file_set_display_name_async)
- 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,
- int io_priority,
- const SlotAsyncReady& slot);
+ 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, int io_priority, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<File> set_display_name_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_set_display_name_finish,
@@ -279,57 +223,32 @@
typedef sigc::slot<void, goffset, goffset> SlotFileProgress;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- bool copy(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotFileProgress& slot);
-
- bool copy(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const SlotFileProgress& slot);
+ bool copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotFileProgress& slot);
+
+ bool copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const SlotFileProgress& slot);
#else
- bool copy(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotFileProgress& slot,
- std::auto_ptr<Glib::Error>& error);
-
- bool copy(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const SlotFileProgress& slot,
- std::auto_ptr<Glib::Error>& error);
+ bool copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotFileProgress& slot, std::auto_ptr<Glib::Error>& error);
+
+ bool copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const SlotFileProgress& slot, std::auto_ptr<Glib::Error>& error);
#endif // GLIBMM_EXCEPTIONS_ENABLED
_IGNORE(g_file_move)
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- bool move(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotFileProgress& slot);
-
- bool move(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const SlotFileProgress& slot);
+ bool move(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotFileProgress& slot);
+
+ bool move(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const SlotFileProgress& slot);
#else
- bool move(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotFileProgress& slot,
- std::auto_ptr<Glib::Error>& error);
-
- bool move(const Glib::RefPtr<File>& destination,
- FileCopyFlags flags,
- const SlotFileProgress& slot,
- std::auto_ptr<Glib::Error>& error);
+ bool move(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const Glib::RefPtr<Cancellable>& cancellable, const SlotFileProgress& slot, std::auto_ptr<Glib::Error>& error);
+
+ bool move(const Glib::RefPtr<File>& destination, FileCopyFlags flags, const SlotFileProgress& slot, std::auto_ptr<Glib::Error>& error);
#endif // GLIBMM_EXCEPTIONS_ENABLED
_WRAP_METHOD(bool make_directory(const Glib::RefPtr<Cancellable>& cancellable),
g_file_make_directory,
errthrow)
- _WRAP_METHOD(bool make_symbolic_link(const std::string& symlink_value,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool make_symbolic_link(const std::string& symlink_value, const Glib::RefPtr<Cancellable>& cancellable),
g_file_make_symbolic_link,
errthrow)
@@ -341,92 +260,58 @@
g_file_query_writable_namespaces,
errthrow)
- _WRAP_METHOD(bool set_attributes_from_info(const Glib::RefPtr<FileInfo>& info,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attributes_from_info(const Glib::RefPtr<FileInfo>& info, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attributes_from_info,
errthrow)
_IGNORE(g_file_set_attributes_async)
- 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,
- FileQueryInfoFlags flags,
- int io_priority,
- const SlotAsyncReady& slot);
+ 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, FileQueryInfoFlags flags, int io_priority, const SlotAsyncReady& slot);
_IGNORE(g_file_set_attributes_finish) // takes GFileInfo**
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- bool set_attributes_finish(const Glib::RefPtr<AsyncResult>& result,
- const Glib::RefPtr<FileInfo>& info);
+ bool set_attributes_finish(const Glib::RefPtr<AsyncResult>& result, const Glib::RefPtr<FileInfo>& info);
#else
- bool set_attributes_finish(const Glib::RefPtr<AsyncResult>& result,
- const Glib::RefPtr<FileInfo>& info,
- std::auto_ptr<Glib::Error>& error);
+ bool set_attributes_finish(const Glib::RefPtr<AsyncResult>& result, const Glib::RefPtr<FileInfo>& info, std::auto_ptr<Glib::Error>& error);
#endif // GLIBMM_EXCEPTIONS_ENABLED
- _WRAP_METHOD(bool set_attribute_string(const std::string& attribute,
- const std::string& value,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attribute_string(const std::string& attribute, const std::string& value, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attribute_string,
errthrow)
- _WRAP_METHOD(bool set_attribute_byte_string(const std::string& attribute,
- const std::string& value,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attribute_byte_string(const std::string& attribute, const std::string& value, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attribute_byte_string,
errthrow)
- _WRAP_METHOD(bool set_attribute_uint32(const std::string& attribute,
- guint32 value,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attribute_uint32(const std::string& attribute, guint32 value, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attribute_uint32,
errthrow)
- _WRAP_METHOD(bool set_attribute_int32(const std::string& attribute,
- gint32 value,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attribute_int32(const std::string& attribute, gint32 value, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attribute_int32,
errthrow)
- _WRAP_METHOD(bool set_attribute_uint64(const std::string& attribute,
- guint64 value,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attribute_uint64(const std::string& attribute, guint64 value, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attribute_uint64,
errthrow)
- _WRAP_METHOD(bool set_attribute_int64(const std::string& attribute,
- gint64 value,
- FileQueryInfoFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool set_attribute_int64(const std::string& attribute, gint64 value, FileQueryInfoFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_file_set_attribute_int64,
errthrow)
_IGNORE(g_file_mount_mountable)
- void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
- void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
- const SlotAsyncReady& slot);
+ void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<File> mount_mountable_finish(const Glib::RefPtr<AsyncResult>& result),
g_file_mount_mountable_finish,
refreturn, errthrow)
_IGNORE(g_file_unmount_mountable)
- void unmount_mountable(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void unmount_mountable(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
void unmount_mountable(const SlotAsyncReady& slot);
@@ -435,8 +320,7 @@
errthrow)
_IGNORE(g_file_eject_mountable)
- void eject_mountable(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void eject_mountable(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
void eject_mountable(const SlotAsyncReady& slot);
@@ -449,77 +333,48 @@
//TODO: atm I don't understand what's etag_out:
// "a pointer to the current entity tag for the document" - sounds like it
// should be kept as char**
- _WRAP_METHOD(bool load_contents(const Glib::RefPtr<Cancellable>& cancellable,
- char** contents,
- gsize& length,
- char** etag_out),
+ _WRAP_METHOD(bool load_contents(const Glib::RefPtr<Cancellable>& cancellable, char** contents, gsize& length, char** etag_out),
g_file_load_contents,
errthrow)
_IGNORE(g_file_load_contents_async)
- void load_contents_async(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void load_contents_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
void load_contents_async(const SlotAsyncReady& slot);
- _WRAP_METHOD(bool load_contents_finish(const Glib::RefPtr<AsyncResult>& result,
- char** contents,
- gsize& length,
- char** etag_out),
+ _WRAP_METHOD(bool load_contents_finish(const Glib::RefPtr<AsyncResult>& result, char** contents, gsize& length, char** etag_out),
g_file_load_contents_finish,
errthrow)
_IGNORE(g_file_load_partial_contents_async)
- void load_partial_contents_async(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void load_partial_contents_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
/** A signal handler would be, for instance:
* bool on_read_more(const char* file_contents, goffset file_size);
*/
typedef sigc::slot<bool, const char*, goffset> SlotReadMore;
- 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);
-
- _WRAP_METHOD(bool load_partial_contents_finish(const Glib::RefPtr<AsyncResult>& result,
- char** contents,
- gsize& length,
- char** etag_out),
+ 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);
+
+ //TODO: atm I don't understand what's etag_out:
+ // "a pointer to the current entity tag for the document" - sounds like it
+ // should be kept as char**
+ _WRAP_METHOD(bool load_partial_contents_finish(const Glib::RefPtr<AsyncResult>& result, char** contents, gsize& length, char** etag_out),
g_file_load_partial_contents_finish,
errthrow)
- _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),
+ _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)
_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);
+ 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);
- _WRAP_METHOD(void replace_contents_finish(const Glib::RefPtr<AsyncResult>& result,
- char** new_etag),
+ _WRAP_METHOD(void replace_contents_finish(const Glib::RefPtr<AsyncResult>& result, char** new_etag),
g_file_replace_contents_finish,
errthrow)
@@ -536,7 +391,7 @@
_WRAP_VFUNC(Glib::RefPtr<File> get_parent() const, "get_parent")
- // GFileIface does not define get_child(). Perhaps it's not intentional.
+ // TODO: GFileIface does not define get_child(). Perhaps it's not intentional.
// _WRAP_VFUNC(Glib::RefPtr<File> get_child(const std::string& name) const, "get_child")
// TODO: howto wrap a vfunc that takes a GError**
@@ -566,3 +421,4 @@
{ return ! lhs->equal(rhs); }
} // namespace Gio
+
Modified: trunk/gio/src/fileattribute.hg
==============================================================================
--- trunk/gio/src/fileattribute.hg (original)
+++ trunk/gio/src/fileattribute.hg Tue Jan 8 15:17:44 2008
@@ -23,7 +23,8 @@
_DEFS(giomm,gio)
-namespace Gio {
+namespace Gio
+{
_WRAP_ENUM(FileAttributeType, GFileAttributeType, NO_GTYPE)
_WRAP_ENUM(FileAttributeFlags, GFileAttributeFlags, NO_GTYPE)
@@ -65,3 +66,4 @@
};
} // namespace Gio
+
Modified: trunk/gio/src/fileenumerator.hg
==============================================================================
--- trunk/gio/src/fileenumerator.hg (original)
+++ trunk/gio/src/fileenumerator.hg Tue Jan 8 15:17:44 2008
@@ -29,7 +29,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
class FileEnumerator : public Glib::Object
{
@@ -73,12 +74,11 @@
errthrow)
_WRAP_METHOD(bool is_closed() const, g_file_enumerator_is_closed)
-
_WRAP_METHOD(bool has_pending() const, g_file_enumerator_has_pending)
-
_WRAP_METHOD(void set_pending(bool pending = true), g_file_enumerator_set_pending)
// TODO: vfuncs, non-cancellable overrides for generated methods.
};
} // namespace Gio
+
Modified: trunk/gio/src/fileicon.hg
==============================================================================
--- trunk/gio/src/fileicon.hg (original)
+++ trunk/gio/src/fileicon.hg Tue Jan 8 15:17:44 2008
@@ -26,9 +26,12 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
-class FileIcon : public Glib::Object, public Icon
+class FileIcon
+: public Glib::Object,
+ public Icon
{
_CLASS_GOBJECT(FileIcon, GFileIcon, G_FILE_ICON, Glib::Object, GObject)
_IMPLEMENTS_INTERFACE(Icon)
@@ -40,7 +43,7 @@
_WRAP_CREATE()
_WRAP_METHOD(Glib::RefPtr<File> get_file(), g_file_icon_get_file, refreturn)
- _WRAP_METHOD(Glib::RefPtr<File> get_file() const, g_file_icon_get_file, refreturn, constversion)
+ _WRAP_METHOD(Glib::RefPtr<const File> get_file() const, g_file_icon_get_file, refreturn, constversion)
};
} // namespace Gio
Modified: trunk/gio/src/fileinfo.hg
==============================================================================
--- trunk/gio/src/fileinfo.hg (original)
+++ trunk/gio/src/fileinfo.hg Tue Jan 8 15:17:44 2008
@@ -28,7 +28,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
_WRAP_ENUM(FileType, GFileType, NO_GTYPE)
@@ -57,125 +58,82 @@
_WRAP_METHOD(Glib::RefPtr<FileInfo> dup() const,
g_file_info_dup)
-
_WRAP_METHOD(void copy_into(Glib::RefPtr<FileInfo>& dest) const,
g_file_info_copy_into)
-
_WRAP_METHOD(bool has_attribute(const std::string& attribute) const,
g_file_info_has_attribute)
-
_WRAP_METHOD(Glib::StringArrayHandle list_attributes(const std::string& name_space) const,
g_file_info_list_attributes)
-
_WRAP_METHOD(FileAttributeType get_attribute_type(const std::string& attribute) const,
g_file_info_get_attribute_type)
-
_WRAP_METHOD(void remove_attribute(const std::string& attribute),
g_file_info_remove_attribute)
-
_WRAP_METHOD(std::string get_attribute_string(const std::string& attribute) const,
g_file_info_get_attribute_string)
-
_WRAP_METHOD(std::string get_attribute_byte_string(const std::string& attribute) const,
g_file_info_get_attribute_byte_string)
-
_WRAP_METHOD(bool get_attribute_boolean(const std::string& attribute) const,
g_file_info_get_attribute_boolean)
-
_WRAP_METHOD(guint32 get_attribute_uint32(const std::string& attribute) const,
g_file_info_get_attribute_uint32)
-
_WRAP_METHOD(gint32 get_attribute_int32(const std::string& attribute) const,
g_file_info_get_attribute_int32)
-
_WRAP_METHOD(guint64 get_attribute_uint64(const std::string& attribute) const,
g_file_info_get_attribute_uint64)
-
_WRAP_METHOD(gint64 get_attribute_int64(const std::string& attribute) const,
g_file_info_get_attribute_int64)
-
_WRAP_METHOD(Glib::RefPtr<Glib::Object> get_attribute_object(const std::string& attribute) const,
g_file_info_get_attribute_object)
-
_WRAP_METHOD(void set_attribute_string(const std::string& attribute, const std::string& value),
g_file_info_set_attribute_string)
-
_WRAP_METHOD(void set_attribute_byte_string(const std::string& attribute, const std::string& value),
g_file_info_set_attribute_byte_string)
-
_WRAP_METHOD(void set_attribute_boolean(const std::string& attribute, bool value),
g_file_info_set_attribute_boolean)
-
_WRAP_METHOD(void set_attribute_uint32(const std::string& attribute, guint32 value),
g_file_info_set_attribute_uint32)
-
_WRAP_METHOD(void set_attribute_int32(const std::string& attribute, gint32 value),
g_file_info_set_attribute_int32)
-
_WRAP_METHOD(void set_attribute_uint64(const std::string& attribute, guint64 value),
g_file_info_set_attribute_uint64)
-
_WRAP_METHOD(void set_attribute_int64(const std::string& attribute, gint64 value),
g_file_info_set_attribute_int64)
-
_WRAP_METHOD(void set_attribute_object(const std::string& attribute, const Glib::RefPtr<Glib::Object>& object),
g_file_info_set_attribute_object)
-
_WRAP_METHOD(void clear_status(), g_file_info_clear_status)
// helper getters
_WRAP_METHOD(FileType get_file_type() const, g_file_info_get_file_type)
-
_WRAP_METHOD(bool is_hidden() const, g_file_info_get_is_hidden)
-
_WRAP_METHOD(bool is_backup() const, g_file_info_get_is_backup)
-
_WRAP_METHOD(bool is_symlink() const, g_file_info_get_is_symlink)
-
_WRAP_METHOD(std::string get_name() const, g_file_info_get_name)
-
_WRAP_METHOD(std::string get_display_name() const, g_file_info_get_display_name)
-
_WRAP_METHOD(std::string get_edit_name() const, g_file_info_get_edit_name)
_WRAP_METHOD(Glib::RefPtr<Icon> get_icon(), g_file_info_get_icon, refreturn)
-
- _WRAP_METHOD(Glib::RefPtr<Icon> get_icon() const, g_file_info_get_icon, refreturn, constversion)
+ _WRAP_METHOD(Glib::RefPtr<const Icon> get_icon() const, g_file_info_get_icon, refreturn, constversion)
_WRAP_METHOD(std::string get_content_type() const, g_file_info_get_content_type)
-
_WRAP_METHOD(goffset get_size() const, g_file_info_get_size)
-
_WRAP_METHOD(void get_modification_time(Glib::TimeVal& mtime) const, g_file_info_get_modification_time)
-
_WRAP_METHOD(std::string get_symlink_target() const, g_file_info_get_symlink_target)
-
_WRAP_METHOD(std::string get_etag() const, g_file_info_get_etag)
-
_WRAP_METHOD(gint32 get_sort_order() const, g_file_info_get_sort_order)
-
_WRAP_METHOD(void set_attribute_mask(const Glib::RefPtr<FileAttributeMatcher>& mask),
g_file_info_set_attribute_mask)
-
_WRAP_METHOD(void unset_attribute_mask(), g_file_info_unset_attribute_mask)
// helper setters
_WRAP_METHOD(void set_file_type(FileType type), g_file_info_set_file_type)
-
_WRAP_METHOD(void set_is_hidden(bool is_hidden = true), g_file_info_set_is_hidden)
-
_WRAP_METHOD(void set_is_symlink(bool is_symlink = true), g_file_info_set_is_symlink)
-
_WRAP_METHOD(void set_name(const std::string& name), g_file_info_set_name)
-
_WRAP_METHOD(void set_display_name(const std::string& display_name), g_file_info_set_display_name)
-
_WRAP_METHOD(void set_edit_name(const std::string& edit_name), g_file_info_set_edit_name)
-
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Icon>& icon), g_file_info_set_icon)
-
_WRAP_METHOD(void set_content_type(const std::string& content_type), g_file_info_set_content_type)
// TODO: how can you set size of a file?!
@@ -183,10 +141,9 @@
_WRAP_METHOD(void set_size(goffset size), g_file_info_set_size)
_WRAP_METHOD(void set_modification_time(Glib::TimeVal& mtime), g_file_info_set_modification_time)
-
_WRAP_METHOD(void set_symlink_target(const std::string& symlink_target), g_file_info_set_symlink_target)
-
_WRAP_METHOD(void set_sort_order(gint32 sort_order), g_file_info_set_sort_order)
};
} // namespace Gio
+
Modified: trunk/gio/src/fileinputstream.hg
==============================================================================
--- trunk/gio/src/fileinputstream.hg (original)
+++ trunk/gio/src/fileinputstream.hg Tue Jan 8 15:17:44 2008
@@ -50,12 +50,11 @@
errthrow)
_WRAP_METHOD(goffset tell() const, g_file_input_stream_tell)
-
_WRAP_METHOD(bool can_seek() const, g_file_input_stream_can_seek)
-
_WRAP_METHOD(bool seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable),
g_file_input_stream_seek,
errthrow)
};
} // namespace Gio
+
Modified: trunk/gio/src/fileoutputstream.hg
==============================================================================
--- trunk/gio/src/fileoutputstream.hg (original)
+++ trunk/gio/src/fileoutputstream.hg Tue Jan 8 15:17:44 2008
@@ -27,7 +27,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/outputstream_p.h)
-namespace Gio {
+namespace Gio
+{
class FileOutputStream : public OutputStream
{
@@ -36,33 +37,25 @@
public:
//TODO: vfuncs and overloads without Cancellable
- _WRAP_METHOD(Glib::RefPtr<FileInfo> query_info(const std::string& attributes,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(Glib::RefPtr<FileInfo> query_info(const std::string& attributes, const Glib::RefPtr<Cancellable>& cancellable),
g_file_output_stream_query_info,
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, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(Glib::RefPtr<FileInfo> query_info_finish(Glib::RefPtr<AsyncResult>& result),
g_file_output_stream_query_info_finish,
refreturn, errthrow)
_WRAP_METHOD(std::string get_etag() const, g_file_output_stream_get_etag)
-
_WRAP_METHOD(goffset tell() const, g_file_output_stream_tell)
-
_WRAP_METHOD(bool can_seek() const, g_file_output_stream_can_seek)
-
_WRAP_METHOD(bool seek(goffset offset, SeekType type, const Glib::RefPtr<Cancellable>& cancellable),
g_file_output_stream_seek,
errthrow)
_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/icon.hg
==============================================================================
--- trunk/gio/src/icon.hg (original)
+++ trunk/gio/src/icon.hg Tue Jan 8 15:17:44 2008
@@ -24,7 +24,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/interface_p.h)
-namespace Gio {
+namespace Gio
+{
class Icon : public Glib::Interface
{
@@ -56,3 +57,4 @@
{ return ! lhs->equal(rhs); }
} // namespace Gio
+
Modified: trunk/gio/src/inputstream.hg
==============================================================================
--- trunk/gio/src/inputstream.hg (original)
+++ trunk/gio/src/inputstream.hg Tue Jan 8 15:17:44 2008
@@ -27,7 +27,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
class InputStream : public Glib::Object
{
@@ -38,21 +39,15 @@
// are used only by g_push/pop_current_cancellable (markoa)
// Btw all cancellable parameters are optional - TODO see how that
// should translate here (overloads for all?).
- _WRAP_METHOD(gssize read(void* buffer,
- gsize count,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(gssize read(void* buffer, gsize count, const Glib::RefPtr<Cancellable>& cancellable),
g_input_stream_read,
errthrow)
- _WRAP_METHOD(bool read_all(void* buffer,
- gsize count,
- gsize& bytes_read,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool read_all(void* buffer, gsize count, gsize& bytes_read, const Glib::RefPtr<Cancellable>& cancellable),
g_input_stream_read_all,
errthrow)
- _WRAP_METHOD(gssize skip(gsize count,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(gssize skip(gsize count, const Glib::RefPtr<Cancellable>& cancellable),
g_input_stream_skip,
errthrow)
@@ -62,30 +57,21 @@
_IGNORE(g_input_stream_read_async)
- void read_async(void* buffer,
- gsize count,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void read_async(void* buffer, gsize count, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gssize read_finish(Glib::RefPtr<AsyncResult>& result),
g_input_stream_read_finish,
errthrow)
_IGNORE(g_input_stream_skip_async)
- void skip_async(gsize count,
- int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void skip_async(gsize count, int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gssize skip_finish(Glib::RefPtr<AsyncResult>& result),
g_input_stream_skip_finish,
errthrow)
_IGNORE(g_input_stream_close_async)
- void close_async(int io_priority,
- Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void close_async(int io_priority, Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
_WRAP_METHOD(gboolean close_finish(Glib::RefPtr<AsyncResult>& result),
g_input_stream_close_finish,
Modified: trunk/gio/src/mountoperation.hg
==============================================================================
--- trunk/gio/src/mountoperation.hg (original)
+++ trunk/gio/src/mountoperation.hg Tue Jan 8 15:17:44 2008
@@ -24,7 +24,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
_WRAP_ENUM(PasswordFlags, GPasswordFlags, NO_GTYPE)
_WRAP_ENUM(PasswordSave, GPasswordSave, NO_GTYPE)
@@ -41,38 +42,26 @@
_WRAP_METHOD(Glib::ustring get_username() const,
g_mount_operation_get_username)
-
_WRAP_METHOD(void set_username(const Glib::ustring& username),
g_mount_operation_set_username)
-
_WRAP_METHOD(Glib::ustring get_password() const,
g_mount_operation_get_password)
-
_WRAP_METHOD(void set_password(const Glib::ustring& password),
g_mount_operation_set_password)
-
_WRAP_METHOD(bool get_anonymous() const,
g_mount_operation_get_anonymous)
-
_WRAP_METHOD(void set_anonymous(bool anonymous = true),
g_mount_operation_set_anonymous)
-
_WRAP_METHOD(Glib::ustring get_domain() const,
g_mount_operation_get_domain)
-
_WRAP_METHOD(void set_domain(const Glib::ustring& domain),
g_mount_operation_set_domain)
-
_WRAP_METHOD(PasswordSave get_password_save() const,
g_mount_operation_get_password_save)
-
_WRAP_METHOD(void set_password_save(PasswordSave password_save),
g_mount_operation_set_password_save)
-
_WRAP_METHOD(int get_choice() const, g_mount_operation_get_choice)
-
_WRAP_METHOD(void set_choice(int choice), g_mount_operation_set_choice)
-
_WRAP_METHOD(void reply(bool abort = false), g_mount_operation_reply)
};
Modified: trunk/gio/src/outputstream.hg
==============================================================================
--- trunk/gio/src/outputstream.hg (original)
+++ trunk/gio/src/outputstream.hg Tue Jan 8 15:17:44 2008
@@ -27,7 +27,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
_WRAP_ENUM(OutputStreamSpliceFlags, GOutputStreamSpliceFlags, NO_GTYPE)
@@ -40,16 +41,11 @@
g_output_stream_write,
errthrow)
- _WRAP_METHOD(bool write_all(const void* buffer,
- gsize count,
- gsize& bytes_written,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(bool write_all(const void* buffer, gsize count, gsize& bytes_written, const Glib::RefPtr<Cancellable>& cancellable),
g_output_stream_write_all,
errthrow)
- _WRAP_METHOD(gssize splice(const Glib::RefPtr<InputStream>& source,
- OutputStreamSpliceFlags flags,
- const Glib::RefPtr<Cancellable>& cancellable),
+ _WRAP_METHOD(gssize splice(const Glib::RefPtr<InputStream>& source, OutputStreamSpliceFlags flags, const Glib::RefPtr<Cancellable>& cancellable),
g_output_stream_splice,
errthrow)
@@ -62,47 +58,34 @@
errthrow)
_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);
+ 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)
_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);
+ 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)
_IGNORE(g_output_stream_flush_async)
- void flush_async(int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ 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)
_IGNORE(g_output_stream_close_async)
- void close_async(int io_priority,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ 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,
errthrow)
_WRAP_METHOD(bool is_closed() const, g_output_stream_is_closed)
-
_WRAP_METHOD(bool has_pending() const, g_output_stream_has_pending)
//TODO: _WRAP_METHOD(bool set_pending(), g_output_stream_set_pending, errthrow)
Modified: trunk/gio/src/simpleasyncresult.hg
==============================================================================
--- trunk/gio/src/simpleasyncresult.hg (original)
+++ trunk/gio/src/simpleasyncresult.hg Tue Jan 8 15:17:44 2008
@@ -25,7 +25,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/object_p.h)
-namespace Gio {
+namespace Gio
+{
class SimpleAsyncResult : public Glib::Object, public AsyncResult
{
Modified: trunk/gio/src/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg (original)
+++ trunk/gio/src/volume.hg Tue Jan 8 15:17:44 2008
@@ -29,7 +29,8 @@
_DEFS(giomm,gio)
_PINCLUDE(glibmm/private/interface_p.h)
-namespace Gio {
+namespace Gio
+{
// Making a forward declaration here to avoid circular dependency.
// file.hg already includes volume.h.
@@ -40,44 +41,36 @@
_CLASS_INTERFACE(Volume, GVolume, G_DRIVE, GVolumeIface)
public:
_WRAP_METHOD(std::string get_name() const, g_volume_get_name)
-
_WRAP_METHOD(std::string get_uuid() const, g_volume_get_uuid)
_WRAP_METHOD(Glib::RefPtr<Icon> get_icon(),
g_volume_get_icon,
refreturn)
-
- _WRAP_METHOD(Glib::RefPtr<Icon> get_icon() const,
+ _WRAP_METHOD(Glib::RefPtr<const Icon> get_icon() const,
g_volume_get_icon,
refreturn, constversion)
_WRAP_METHOD(Glib::RefPtr<Drive> get_drive(),
g_volume_get_drive,
refreturn)
-
- _WRAP_METHOD(Glib::RefPtr<Drive> get_drive() const,
+ _WRAP_METHOD(Glib::RefPtr<const Drive> get_drive() const,
g_volume_get_drive,
refreturn, constversion)
_WRAP_METHOD(bool can_mount() const, g_volume_can_mount)
-
_WRAP_METHOD(bool can_eject() const, g_volume_can_eject)
- _IGNORE(g_volume_mount)
- void mount(const Glib::RefPtr<MountOperation>& mount_operation,
- const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ _IGNORE(g_volume_mount)
+ 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);
+ void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot);
_WRAP_METHOD(bool mount_finish(Glib::RefPtr<AsyncResult>& result),
g_volume_mount_finish,
errthrow)
_IGNORE(g_volume_eject)
- void eject(const Glib::RefPtr<Cancellable>& cancellable,
- const SlotAsyncReady& slot);
+ void eject(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
void eject(const SlotAsyncReady& slot);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
