diff options
author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-01-21 17:02:11 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-01-21 17:02:11 +0100 |
commit | df166d848282296c6d121b72a265a0429aca18d9 (patch) | |
tree | f12f3ffbfcbec07669d740559562c1e25685f60b | |
parent | 27975c1ad1b24e96079fa61bc882e5033277e22a (diff) | |
download | glibmm-df166d848282296c6d121b72a265a0429aca18d9.tar.gz |
Add _IGNORE()s, remove obsolete comments
* gio/src/cancellable.hg: Remove obsolete comment.
* gio/src/dbusmessage.hg: Fix a typo. Remove obsolete comment. Add _IGNORE().
* gio/src/application.hg:
* gio/src/inputstream.hg:
* gio/src/outputstream.hg:
* gio/src/socketconnection.hg:
* glib/src/bytes.hg:
* glib/src/module.hg:
* glib/src/variant.hg: Add _IGNORE().
-rw-r--r-- | gio/src/application.hg | 1 | ||||
-rw-r--r-- | gio/src/cancellable.hg | 3 | ||||
-rw-r--r-- | gio/src/dbusmessage.hg | 8 | ||||
-rw-r--r-- | gio/src/inputstream.hg | 1 | ||||
-rw-r--r-- | gio/src/outputstream.hg | 1 | ||||
-rw-r--r-- | gio/src/socketconnection.hg | 3 | ||||
-rw-r--r-- | glib/src/bytes.hg | 3 | ||||
-rw-r--r-- | glib/src/module.hg | 5 | ||||
-rw-r--r-- | glib/src/variant.hg | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/gio/src/application.hg b/gio/src/application.hg index c8211503..d619902f 100644 --- a/gio/src/application.hg +++ b/gio/src/application.hg @@ -133,6 +133,7 @@ public: //Renamed from register() because that is a C++ keyword. _WRAP_METHOD(bool register_application(const Glib::RefPtr<Gio::Cancellable>& cancellable{?}), g_application_register, errthrow) + _IGNORE(g_application_impl_register) _WRAP_METHOD(void hold(), g_application_hold) _WRAP_METHOD(void release(), g_application_release) diff --git a/gio/src/cancellable.hg b/gio/src/cancellable.hg index 4ca5df55..2fcd58bd 100644 --- a/gio/src/cancellable.hg +++ b/gio/src/cancellable.hg @@ -64,9 +64,6 @@ public: g_cancellable_pop_current) _WRAP_METHOD(void reset(), g_cancellable_reset) - // TODO: is this useful in the C++ API? - //_WRAP_METHOD(void make_pollfd(PollFD* pollfd), g_cancellable_make_pollfd) - /** Convenience function to connect to the Cancellable::signal_cancelled() * signal. Also handles the race condition that may happen * if the cancellable is cancelled right before connecting. diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg index 3ca25115..71b9c89a 100644 --- a/gio/src/dbusmessage.hg +++ b/gio/src/dbusmessage.hg @@ -65,15 +65,15 @@ public: // See here about whether the parameters should be ustring or std::string: // http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names // They are generally UTF-8 that can only contain the ASCII subset, - // so ustring still seems preferrable to std::string, which generally implies an unknown endoding for us. + // so ustring still seems preferrable to std::string, which generally implies an unknown encoding for us. _WRAP_METHOD(static Glib::RefPtr<Message> create_signal(const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& signal), g_dbus_message_new_signal) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_call(const Glib::ustring& name, const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& method), g_dbus_message_new_method_call) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_reply(const Glib::RefPtr<Message>& method_call_message), g_dbus_message_new_method_reply) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_error_literal(const Glib::RefPtr<const Message>& method_call_message, const Glib::ustring& error_name, const Glib::ustring& error_message), g_dbus_message_new_method_error_literal) - // Ignore variable argument function. - _IGNORE(g_dbus_message_new_method_error) + // Ignore variable argument functions. + _IGNORE(g_dbus_message_new_method_error, g_dbus_message_new_method_error_valist) _WRAP_METHOD(static Glib::RefPtr<Message> create_from_blob(const guchar* blob, gsize blob_len, CapabilityFlags capabilities = CAPABILITY_FLAGS_NONE), g_dbus_message_new_from_blob, errthrow) @@ -128,8 +128,6 @@ public: _WRAP_METHOD(guint32 get_num_unix_fds() const, g_dbus_message_get_num_unix_fds) _WRAP_METHOD(void set_num_unix_fds(guint32 value), g_dbus_message_set_num_unix_fds) - //TODO: _WRAP_METHOD(std::vector<whattypeshallweuse>) get_header_fields() const, g_dbus_message_get_header_fields) - /** Gets a header field on the message. The header is returned in @a value. * @param value Location in which to store the header. * @param header_field The header field type. diff --git a/gio/src/inputstream.hg b/gio/src/inputstream.hg index 7065303d..64c53c4e 100644 --- a/gio/src/inputstream.hg +++ b/gio/src/inputstream.hg @@ -41,6 +41,7 @@ namespace Gio class InputStream : public Glib::Object { _CLASS_GOBJECT(InputStream, GInputStream, G_INPUT_STREAM, Glib::Object, GObject) + _IGNORE(g_input_stream_async_read_is_via_threads) dnl// private method public: _WRAP_METHOD(gssize read(void* buffer, gsize count, const Glib::RefPtr<Cancellable>& cancellable{?}), diff --git a/gio/src/outputstream.hg b/gio/src/outputstream.hg index 39b27e47..d13992f6 100644 --- a/gio/src/outputstream.hg +++ b/gio/src/outputstream.hg @@ -39,6 +39,7 @@ _WRAP_ENUM(OutputStreamSpliceFlags, GOutputStreamSpliceFlags, NO_GTYPE) class OutputStream : public Glib::Object { _CLASS_GOBJECT(OutputStream, GOutputStream, G_OUTPUT_STREAM, Glib::Object, GObject) + _IGNORE(g_output_stream_async_write_is_via_threads) dnl// private method public: diff --git a/gio/src/socketconnection.hg b/gio/src/socketconnection.hg index 2e8b8590..f1543869 100644 --- a/gio/src/socketconnection.hg +++ b/gio/src/socketconnection.hg @@ -51,7 +51,8 @@ namespace Gio */ class SocketConnection : public Gio::IOStream { - _CLASS_GOBJECT(SocketConnection, GSocketConnection, G_SOCKET_CONNECTION, Gio::IOStream, GIOStream) + _CLASS_GOBJECT(SocketConnection, GSocketConnection, G_SOCKET_CONNECTION, Gio::IOStream, GIOStream) + _IGNORE(g_socket_connection_set_cached_remote_address) dnl// private method public: _WRAP_METHOD(bool connect(const Glib::RefPtr<SocketAddress>& address, const Glib::RefPtr<Cancellable>& cancellable{?}), g_socket_connection_connect, errthrow) diff --git a/glib/src/bytes.hg b/glib/src/bytes.hg index 1c81e61b..255c6689 100644 --- a/glib/src/bytes.hg +++ b/glib/src/bytes.hg @@ -39,7 +39,7 @@ namespace Glib /** A simple refcounted data type representing an immutable byte sequence * from an unspecified origin. * - * The purpose of a the Bytes class is to keep the memory region that it holds + * The purpose of the Bytes class is to keep the memory region that it holds * alive for as long as anyone holds a reference to the bytes. When * the last reference count is dropped, the memory is released. Multiple * unrelated callers can use byte data in the Bytes object without coordinating @@ -60,6 +60,7 @@ class Bytes public: static Glib::RefPtr<Glib::Bytes> create(gconstpointer data, gsize size); + _IGNORE(g_bytes_new_from_bytes, g_bytes_unref_to_data, g_bytes_unref_to_array) _WRAP_METHOD(gconstpointer get_data(gsize& size) const, g_bytes_get_data) _WRAP_METHOD(gsize get_size() const, g_bytes_get_size) diff --git a/glib/src/module.hg b/glib/src/module.hg index afa2bcd9..65f7f87a 100644 --- a/glib/src/module.hg +++ b/glib/src/module.hg @@ -41,7 +41,7 @@ _WRAP_ENUM(ModuleFlags, GModuleFlags, NO_GTYPE) class Module { _CLASS_GENERIC(Module, GModule) - _IGNORE(g_module_open, g_module_close) + _IGNORE(g_module_open, g_module_open_utf8, g_module_close) public: @@ -106,6 +106,7 @@ public: * @returns The name of the module */ _WRAP_METHOD(std::string get_name() const, g_module_name) + _IGNORE(g_module_name_utf8) /** A portable way to build the filename of a module. The * platform-specific prefix and suffix are added to the filename, if @@ -117,7 +118,7 @@ public: * module is in a standard platform-specific directory, though this * is not recommended since the wrong module may be found. * - * For example, calling <tt>g_module_build_path()</tt> on a Linux + * For example, calling <tt>build_path()</tt> on a Linux * system with a directory of <tt>/lib</tt> and a module_name of * "mylibrary" will return <tt>/lib/libmylibrary.so</tt>. On a * Windows system, using <tt>\\Windows</tt> as the directory it will diff --git a/glib/src/variant.hg b/glib/src/variant.hg index 1f905fc0..c7424ab1 100644 --- a/glib/src/variant.hg +++ b/glib/src/variant.hg @@ -88,7 +88,7 @@ class VariantBase { _CLASS_OPAQUE_COPYABLE(VariantBase, GVariant, NONE, g_variant_ref_sink, g_variant_unref) _CUSTOM_CTOR_CAST() - _IGNORE(g_variant_ref, g_variant_ref_sink, g_variant_unref, + _IGNORE(g_variant_ref, g_variant_ref_sink, g_variant_take_ref, g_variant_unref, g_variant_get, g_variant_get_va) public: |