Comment out _WRAP_VFUNC() lines because we decided that they are not

2008-02-20  Murray Cumming  <murrayc@murrayc.com>

* gio/src/appinfo.hg:
* gio/src/bufferedinputstream.hg:
* gio/src/drive.hg:
* gio/src/file.hg:
* gio/src/filemonitor.hg:
* gio/src/icon.hg:
* gio/src/seekable.hg:
* gio/src/volume.hg:
* gio/src/volumemonitor.hg: Comment out _WRAP_VFUNC() lines because 
we decided that they are not useful (people will not create new 
implementations with giomm) and are a potential source of errors.

svn path=/trunk/; revision=606

9 files changed, 61 insertions, 61 deletions

diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg
index 464285db..1d3f0f6b 100644
--- a/gio/src/appinfo.hg
+++ b/gio/src/appinfo.hg
@@ -140,25 +140,25 @@ public:
   static Glib::RefPtr<AppInfo> get_default_for_uri_scheme(const std::string& uri_scheme);
 
 protected:
-  _WRAP_VFUNC(Glib::RefPtr<AppInfo> dup(), "dup")
-  _WRAP_VFUNC(bool equal(const Glib::RefPtr<AppInfo>& appinfo2), "equal")
-  _WRAP_VFUNC(std::string get_id() const, "get_id")
-  _WRAP_VFUNC(std::string get_name() const, "get_name")
-  _WRAP_VFUNC(std::string get_description() const, "get_description")
-  _WRAP_VFUNC(std::string get_executable() const, "get_executable")
-  _WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, "get_icon")
+  //_WRAP_VFUNC(Glib::RefPtr<AppInfo> dup(), "dup")
+  //_WRAP_VFUNC(bool equal(const Glib::RefPtr<AppInfo>& appinfo2), "equal")
+  //_WRAP_VFUNC(std::string get_id() const, "get_id")
+  //_WRAP_VFUNC(std::string get_name() const, "get_name")
+  //_WRAP_VFUNC(std::string get_description() const, "get_description")
+  //_WRAP_VFUNC(std::string get_executable() const, "get_executable")
+  //_WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, "get_icon")
 #m4 _CONVERSION(`const Glib::ListHandle<std::string>&',`GList*',`$3.data()')
 #m4 _CONVERSION(`GList*',`const Glib::ListHandle<std::string>&',`Glib::ListHandle<std::string>($3, Glib::OWNERSHIP_NONE)')
-  _WRAP_VFUNC(bool launch(const Glib::ListHandle<std::string>& filenames, const Glib::RefPtr<AppLaunchContext>& launch_context, GError** error), "launch")
-  _WRAP_VFUNC(bool supports_uris() const, "supports_uris")
-  _WRAP_VFUNC(bool supports_files() const, "supports_files")
-  _WRAP_VFUNC(bool launch_uris(const Glib::ListHandle<std::string>& uris, const Glib::RefPtr<AppLaunchContext>& launch_context, GError** error), "launch_uris")
-  _WRAP_VFUNC(bool should_show() const, "should_show")
-  _WRAP_VFUNC(bool set_as_default_for_type(const std::string& content_type, GError** error), "set_as_default_for_type")
-  _WRAP_VFUNC(bool set_as_default_for_extension(const std::string& extension, GError** error), "set_as_default_for_extension")
-  _WRAP_VFUNC(bool add_supports_type(const std::string& content_type, GError** error), "add_supports_type")
-  _WRAP_VFUNC(bool can_remove_supports_type() const, "can_remove_supports_type")
-  _WRAP_VFUNC(bool remove_supports_type(const std::string& content_type, GError** error), "remove_supports_type")
+  //_WRAP_VFUNC(bool launch(const Glib::ListHandle<std::string>& filenames, const Glib::RefPtr<AppLaunchContext>& launch_context, GError** error), "launch")
+  //_WRAP_VFUNC(bool supports_uris() const, "supports_uris")
+  //_WRAP_VFUNC(bool supports_files() const, "supports_files")
+  //_WRAP_VFUNC(bool launch_uris(const Glib::ListHandle<std::string>& uris, const Glib::RefPtr<AppLaunchContext>& launch_context, GError** error), "launch_uris")
+  //_WRAP_VFUNC(bool should_show() const, "should_show")
+  //_WRAP_VFUNC(bool set_as_default_for_type(const std::string& content_type, GError** error), "set_as_default_for_type")
+  //_WRAP_VFUNC(bool set_as_default_for_extension(const std::string& extension, GError** error), "set_as_default_for_extension")
+  //_WRAP_VFUNC(bool add_supports_type(const std::string& content_type, GError** error), "add_supports_type")
+  //_WRAP_VFUNC(bool can_remove_supports_type() const, "can_remove_supports_type")
+  //_WRAP_VFUNC(bool remove_supports_type(const std::string& content_type, GError** error), "remove_supports_type")
 };
 
 } // namespace Gio
diff --git a/gio/src/bufferedinputstream.hg b/gio/src/bufferedinputstream.hg
index 3339c359..8c77fdb3 100644
--- a/gio/src/bufferedinputstream.hg
+++ b/gio/src/bufferedinputstream.hg
@@ -93,7 +93,7 @@ public:
 
 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")
+  //_WRAP_VFUNC(gssize fill(gssize count, const Glib::RefPtr<Cancellable>& cancellable, GError** error), "fill")
   // TODO: wrap async vfuncs
 };
 
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index db48ccf6..e3f2ced5 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -112,9 +112,9 @@ public:
   _WRAP_METHOD(std::string get_identifier(const std::string& kind) const, g_drive_get_identifier)
   _WRAP_METHOD(Glib::StringArrayHandle enumerate_identifiers() const, g_drive_enumerate_identifiers)
 
-  _WRAP_VFUNC(Glib::ustring get_name() const, get_name)
-  //TODO: Careful of ref-counting: _WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, get_icon)
-  _WRAP_VFUNC(bool has_volumes() const, has_volumes)
+  //_WRAP_VFUNC(Glib::ustring get_name() const, get_name)
+  //TODO: Careful of ref-counting: //_WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, get_icon)
+  //_WRAP_VFUNC(bool has_volumes() const, has_volumes)
   //TODO: finish
 };
 
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 75884c85..70eeef93 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -1907,35 +1907,35 @@ public:
 
   // *** vfuncs ***
 
-  _WRAP_VFUNC(Glib::RefPtr<File> dup() const, "dup")
-  _WRAP_VFUNC(guint hash() const, "hash")
+  //_WRAP_VFUNC(Glib::RefPtr<File> dup() const, "dup")
+  //_WRAP_VFUNC(guint hash() const, "hash")
   //TODO: equal() vfunc
 
-  _WRAP_VFUNC(std::string get_basename() const, "get_basename")
-  _WRAP_VFUNC(std::string get_path() const, "get_path")
-  _WRAP_VFUNC(std::string get_uri() const, "get_uri")
-  _WRAP_VFUNC(std::string get_parse_name() const, "get_parse_name")
+  //_WRAP_VFUNC(std::string get_basename() const, "get_basename")
+  //_WRAP_VFUNC(std::string get_path() const, "get_path")
+  //_WRAP_VFUNC(std::string get_uri() const, "get_uri")
+  //_WRAP_VFUNC(std::string get_parse_name() const, "get_parse_name")
 
-  //TODO: Careful of refcounting: _WRAP_VFUNC(Glib::RefPtr<File> get_parent() const, "get_parent")
+  //TODO: Careful of refcounting: //_WRAP_VFUNC(Glib::RefPtr<File> get_parent() const, "get_parent")
 
   // 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")
+  //  //_WRAP_VFUNC(Glib::RefPtr<File> get_child(const std::string& name) const, "get_child")
 
   // TODO: howto wrap a vfunc that takes a GError**
-//   _WRAP_VFUNC(Glib::RefPtr<File> get_child_for_display_name(const Glib::ustring& display_name) const,
+//   //_WRAP_VFUNC(Glib::RefPtr<File> get_child_for_display_name(const Glib::ustring& display_name) const,
 //               "get_child_for_display_name",
 //               errthrow)
 
 #m4 _CONVERSION(`GFile*',`const Glib::RefPtr<const File>&',`Glib::wrap($3, true)')
 
-  _WRAP_VFUNC(bool contains_file(const Glib::RefPtr<const File>& descendant) const, "contains_file")
+  //_WRAP_VFUNC(bool contains_file(const Glib::RefPtr<const File>& descendant) const, "contains_file")
 
-  _WRAP_VFUNC(std::string get_relative_path(const Glib::RefPtr<const File>& descendant) const, "get_relative_path")
+  //_WRAP_VFUNC(std::string get_relative_path(const Glib::RefPtr<const File>& descendant) const, "get_relative_path")
 
-  //TODO: Careful of refcounting:   _WRAP_VFUNC(Glib::RefPtr<const File> resolve_relative_path(const std::string& relative_path) const, "resolve_relative_path")
+  //TODO: Careful of refcounting:   //_WRAP_VFUNC(Glib::RefPtr<const File> resolve_relative_path(const std::string& relative_path) const, "resolve_relative_path")
 
-  _WRAP_VFUNC(bool is_native() const, "is_native")
-  _WRAP_VFUNC(bool has_uri_scheme(const std::string& uri_scheme) const, "has_uri_scheme")
+  //_WRAP_VFUNC(bool is_native() const, "is_native")
+  //_WRAP_VFUNC(bool has_uri_scheme(const std::string& uri_scheme) const, "has_uri_scheme")
 };
 
 
diff --git a/gio/src/filemonitor.hg b/gio/src/filemonitor.hg
index 4f540dba..f735f7c9 100644
--- a/gio/src/filemonitor.hg
+++ b/gio/src/filemonitor.hg
@@ -58,7 +58,7 @@ public:
   _WRAP_SIGNAL(void changed(const Glib::RefPtr<File>& file, const Glib::RefPtr<File>& other_file, FileMonitorEvent event_type), "changed")
   
   //TODO: Write .defs for the vfunc:
-  _WRAP_VFUNC(bool cancel(), cancel);
+  //_WRAP_VFUNC(bool cancel(), cancel);
 
   _WRAP_PROPERTY("rate-limit", int)
   _WRAP_PROPERTY("cancelled", bool)
diff --git a/gio/src/icon.hg b/gio/src/icon.hg
index 6c4dda2e..5f0671d3 100644
--- a/gio/src/icon.hg
+++ b/gio/src/icon.hg
@@ -51,7 +51,7 @@ public:
   // be available to derived classes?
   bool equal(const Glib::RefPtr<Icon>& other) const;
 
-  _WRAP_VFUNC(guint hash() const, "hash")
+  //_WRAP_VFUNC(guint hash() const, "hash")
 
   // TODO: also kind of related to equal() being virtual or not,
   // do we need to have equal_vfunc()? Or rather, why would we want
diff --git a/gio/src/seekable.hg b/gio/src/seekable.hg
index 8d8a0bc0..f0ff1fc3 100644
--- a/gio/src/seekable.hg
+++ b/gio/src/seekable.hg
@@ -83,13 +83,13 @@ public:
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
 //TODO: Write the .defs for these:
-  _WRAP_VFUNC(goffset tell() const, tell)
-  _WRAP_VFUNC(goffset can_seek() const, can_seek)
-  _WRAP_VFUNC(goffset seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable, GError** error), seek)
-  _WRAP_VFUNC(goffset can_truncate() const, can_truncate)
+  //_WRAP_VFUNC(goffset tell() const, tell)
+  //_WRAP_VFUNC(goffset can_seek() const, can_seek)
+  //_WRAP_VFUNC(goffset seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable, GError** error), seek)
+  //_WRAP_VFUNC(goffset can_truncate() const, can_truncate)
 
   //Renamed to truncate() - we don't know why it's called truncate_fn in C.
-  _WRAP_VFUNC(goffset truncate(goffset offset, const Glib::RefPtr<Cancellable>& cancellable, GError** error), truncate_fn)
+  //_WRAP_VFUNC(goffset truncate(goffset offset, const Glib::RefPtr<Cancellable>& cancellable, GError** error), truncate_fn)
 
   //There are no properties or signals.
 };
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index 982dae0a..6cf3163f 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -156,29 +156,29 @@ public:
   _WRAP_SIGNAL(void changed(), changed)
   _WRAP_SIGNAL(void removed(), removed)
 
-  _WRAP_VFUNC(std::string get_name(), get_name)
-  _WRAP_VFUNC(Glib::RefPtr<Icon> get_icon(), get_icon)
-  _WRAP_VFUNC(std::string get_uuid(), get_uuid)
+  //_WRAP_VFUNC(std::string get_name(), get_name)
+  //_WRAP_VFUNC(Glib::RefPtr<Icon> get_icon(), get_icon)
+  //_WRAP_VFUNC(std::string get_uuid(), get_uuid)
 
 #m4 _CONVERSION(`Glib::RefPtr<Drive>',`GDrive*',__CONVERT_CONST_REFPTR_TO_P)
-  _WRAP_VFUNC(Glib::RefPtr<Drive> get_drive(), get_drive)
+  //_WRAP_VFUNC(Glib::RefPtr<Drive> get_drive(), get_drive)
 
 #m4 _CONVERSION(`Glib::RefPtr<Mount>',`GMount*',__CONVERT_CONST_REFPTR_TO_P)
-  _WRAP_VFUNC(Glib::RefPtr<Mount> get_mount(), get_mount)
-
-  _WRAP_VFUNC(bool can_mount(), can_mount)
-  _WRAP_VFUNC(bool can_eject(), can_eject)
-  _WRAP_VFUNC(void mount_fn(GMountMountFlags flags, GMountOperation* mount_operation, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer user_data), mount_fn) //TODO: Rename to mount()?       
-  _WRAP_VFUNC(bool mount_finish(GAsyncResult* result, GError** error), mount_finish)
-  _WRAP_VFUNC(void eject(GMountUnmountFlags flags, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer user_data), eject)
-  _WRAP_VFUNC(bool eject_finish(GAsyncResult* result, GError** error), eject_finish)
+  //_WRAP_VFUNC(Glib::RefPtr<Mount> get_mount(), get_mount)
+
+  //_WRAP_VFUNC(bool can_mount(), can_mount)
+  //_WRAP_VFUNC(bool can_eject(), can_eject)
+  //_WRAP_VFUNC(void mount_fn(GMountMountFlags flags, GMountOperation* mount_operation, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer user_data), mount_fn) //TODO: Rename to mount()?       
+  //_WRAP_VFUNC(bool mount_finish(GAsyncResult* result, GError** error), mount_finish)
+  //_WRAP_VFUNC(void eject(GMountUnmountFlags flags, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer user_data), eject)
+  //_WRAP_VFUNC(bool eject_finish(GAsyncResult* result, GError** error), eject_finish)
   
-  _WRAP_VFUNC(std::string get_identifier(const std::string& kind), get_identifier)
+  //_WRAP_VFUNC(std::string get_identifier(const std::string& kind), get_identifier)
 
   //TODO: Use an ArrayHandle.
-  _WRAP_VFUNC(char** enumerate_identifiers(), enumerate_identifiers)
+  //_WRAP_VFUNC(char** enumerate_identifiers(), enumerate_identifiers)
 
-  _WRAP_VFUNC(bool should_automount(), should_automount)
+  //_WRAP_VFUNC(bool should_automount(), should_automount)
 };
 
 } // namespace Gio
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index 44f1c126..dc86f24f 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -76,14 +76,14 @@ public:
   gboolean (*is_supported)          (void);
 
   //TODO: Use ListHandle?
-  _WRAP_VFUNC(GList* get_volumes(), get_volumes)
-  _WRAP_VFUNC(GList* get_mounts(), get_mounts)
+  //_WRAP_VFUNC(GList* get_volumes(), get_volumes)
+  //_WRAP_VFUNC(GList* get_mounts(), get_mounts)
 
 #m4 _CONVERSION(`Glib::RefPtr<Volume>',`GVolume*',__CONVERT_CONST_REFPTR_TO_P)
-  _WRAP_VFUNC(Glib::RefPtr<Volume> get_volume_for_uuid(const std::string& uuid), get_volume_for_uuid)
+  //_WRAP_VFUNC(Glib::RefPtr<Volume> get_volume_for_uuid(const std::string& uuid), get_volume_for_uuid)
 
 #m4 _CONVERSION(`Glib::RefPtr<Mount>',`GMount*',__CONVERT_CONST_REFPTR_TO_P)
-  _WRAP_VFUNC(Glib::RefPtr<Mount> get_mount_for_uuid(const std::string& uuid), get_mount_for_uuid)
+  //_WRAP_VFUNC(Glib::RefPtr<Mount> get_mount_for_uuid(const std::string& uuid), get_mount_for_uuid)
 
 
   //There are no properties.