GNOME.org
 

[glibmm] Fix the version numbers in some @newin Doxygen commands

commit a8efa7b87439692568c93e82ae086fa78f63a896
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri May 8 16:50:55 2015 +0200

    Fix the version numbers in some @newin Doxygen commands
    
    * gio/src/application.hg:
    * gio/src/dbusintrospection.hg:
    * gio/src/memoryinputstream.hg:
    * gio/src/networkmonitor.hg:
    * gio/src/notification.hg:
    * gio/src/resource.hg:
    * gio/src/tcpwrapperconnection.hg:
    * glib/src/binding.hg:
    * glib/src/variant.hg: Correct the version numbers in some @newin commands
    by adding 'newin "2,n"' parameters to _WRAP_xxx macros. Bug #748856.

 gio/src/application.hg          |    5 +++--
 gio/src/dbusintrospection.hg    |    6 ++----
 gio/src/memoryinputstream.hg    |    4 +---
 gio/src/networkmonitor.hg       |   12 ++++++------
 gio/src/notification.hg         |    4 ++--
 gio/src/resource.hg             |   26 +++++++++++++-------------
 gio/src/tcpwrapperconnection.hg |    2 +-
 glib/src/binding.hg             |   16 ++++++++--------
 glib/src/variant.hg             |    4 ++--
 9 files changed, 38 insertions(+), 41 deletions(-)
---
diff --git a/gio/src/application.hg b/gio/src/application.hg
index f2b1e66..9cccc2e 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -160,11 +160,12 @@ public:
   _WRAP_METHOD(ApplicationFlags get_flags() const, g_application_get_flags)
   _WRAP_METHOD(void set_flags(ApplicationFlags flags), g_application_set_flags)
 
-  _WRAP_METHOD(std::string get_resource_base_path() const, g_application_get_resource_base_path)
-  _WRAP_METHOD(void set_resource_base_path(const std::string& resource_path), 
g_application_set_resource_base_path)
+  _WRAP_METHOD(std::string get_resource_base_path() const, g_application_get_resource_base_path, newin 
"2,44")
+  _WRAP_METHOD(void set_resource_base_path(const std::string& resource_path), 
g_application_set_resource_base_path, newin "2,44")
 
   /** Disable automatic resource loading functionality.
    * See set_resource_base_path().
+   * @newin{2,44}
    */
   void unset_resource_base_path();
 
diff --git a/gio/src/dbusintrospection.hg b/gio/src/dbusintrospection.hg
index 419c424..442415a 100644
--- a/gio/src/dbusintrospection.hg
+++ b/gio/src/dbusintrospection.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -119,8 +117,8 @@ public:
   _WRAP_METHOD(Glib::RefPtr<PropertyInfo> lookup_property(const Glib::ustring& name), 
g_dbus_interface_info_lookup_property, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const PropertyInfo> lookup_property(const Glib::ustring& name) const, 
g_dbus_interface_info_lookup_property, constversion, refreturn)
 
-  _WRAP_METHOD(void cache_build(), g_dbus_interface_info_cache_build)
-  _WRAP_METHOD(void cache_release(), g_dbus_interface_info_cache_release)
+  _WRAP_METHOD(void cache_build(), g_dbus_interface_info_cache_build, newin "2,44")
+  _WRAP_METHOD(void cache_release(), g_dbus_interface_info_cache_release, newin "2,44")
 
   //TODO: _WRAP_METHOD(void generate_xml(guint indent, GString* string_builder), 
g_dbus_interface_info_generate_xml)
 };
diff --git a/gio/src/memoryinputstream.hg b/gio/src/memoryinputstream.hg
index 3b83675..0d51959 100644
--- a/gio/src/memoryinputstream.hg
+++ b/gio/src/memoryinputstream.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -88,7 +86,7 @@ _DEPRECATE_IFDEF_END
    */
   void add_data(const void* data, gssize len, const SlotDestroyData& destroy_slot);
 
-  _WRAP_METHOD(void add_bytes(const Glib::RefPtr<const Glib::Bytes>& bytes), g_memory_input_stream_add_bytes)
+  _WRAP_METHOD(void add_bytes(const Glib::RefPtr<const Glib::Bytes>& bytes), 
g_memory_input_stream_add_bytes, newin "2,44")
 };
 
 } // namespace Gio
diff --git a/gio/src/networkmonitor.hg b/gio/src/networkmonitor.hg
index 4c6ee89..8441f8e 100644
--- a/gio/src/networkmonitor.hg
+++ b/gio/src/networkmonitor.hg
@@ -37,28 +37,28 @@ _WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity, NO_GTYPE)
 
 /** TODO
  *
- * @newin{2,42}
+ * @newin{2,44}
  */
 class NetworkMonitor : public Glib::Interface
 {
   _CLASS_INTERFACE(NetworkMonitor, GNetworkMonitor, G_NETWORK_MONITOR, GNetworkMonitorInterface)
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<NetworkMonitor> get_default(), g_network_monitor_get_default)
+  _WRAP_METHOD(static Glib::RefPtr<NetworkMonitor> get_default(), g_network_monitor_get_default, newin 
"2,44")
 
-  _WRAP_METHOD(bool get_network_available() const, g_network_monitor_get_network_available)
+  _WRAP_METHOD(bool get_network_available() const, g_network_monitor_get_network_available, newin "2,44")
 
   _WRAP_METHOD(NetworkConnectivity get_connectivity() const, g_network_monitor_get_connectivity)
 
-  _WRAP_METHOD(bool can_reach(const Glib::RefPtr<SocketConnectable>& connectable, const 
Glib::RefPtr<Cancellable>& cancellable{?}), g_network_monitor_can_reach, errthrow)
+  _WRAP_METHOD(bool can_reach(const Glib::RefPtr<SocketConnectable>& connectable, const 
Glib::RefPtr<Cancellable>& cancellable{?}), g_network_monitor_can_reach, errthrow, newin "2,44")
 
   //TODO:
   void can_reach_async(const Glib::RefPtr<SocketConnectable>& connectable, const SlotAsyncReady& slot, const 
Glib::RefPtr<Cancellable>& cancellable);
   _IGNORE(g_network_monitor_can_reach_async)
 
-  _WRAP_METHOD(bool can_reach_finish(const Glib::RefPtr<AsyncResult>& result), 
g_network_monitor_can_reach_finish, errthrow)
+  _WRAP_METHOD(bool can_reach_finish(const Glib::RefPtr<AsyncResult>& result), 
g_network_monitor_can_reach_finish, errthrow, newin "2,44")
 
-  _WRAP_SIGNAL(void network_changed(bool available), "network-changed")
+  _WRAP_SIGNAL(void network_changed(bool available), "network-changed", newin "2,44")
 
   //TODO: Wrap vfuncs?
 
diff --git a/gio/src/notification.hg b/gio/src/notification.hg
index f936192..cd5ec92 100644
--- a/gio/src/notification.hg
+++ b/gio/src/notification.hg
@@ -30,7 +30,7 @@ namespace Gio
 {
 class Icon;
 
-_WRAP_ENUM(NotificationPriority, GNotificationPriority)
+_WRAP_ENUM(NotificationPriority, GNotificationPriority, newin "2,44")
 
 /** User Notifications (pop up messages).
  *
@@ -75,7 +75,7 @@ public:
   _WRAP_METHOD(void set_body(const Glib::ustring& body), g_notification_set_body)
   _WRAP_METHOD(void set_icon(const Glib::RefPtr<Icon>& icon), g_notification_set_icon)
   _WRAP_METHOD(void set_urgent(bool urgent = true), g_notification_set_urgent, deprecated "Use 
set_priority() instead.")
-  _WRAP_METHOD(void set_priority(NotificationPriority priority = NOTIFICATION_PRIORITY_NORMAL), 
g_notification_set_priority)
+  _WRAP_METHOD(void set_priority(NotificationPriority priority = NOTIFICATION_PRIORITY_NORMAL), 
g_notification_set_priority, newin "2,44")
 
   _WRAP_METHOD(void add_button(const Glib::ustring& label, const Glib::ustring& detailed_action), 
g_notification_add_button)
 
diff --git a/gio/src/resource.hg b/gio/src/resource.hg
index dbb289e..730e221 100644
--- a/gio/src/resource.hg
+++ b/gio/src/resource.hg
@@ -33,10 +33,10 @@ namespace Gio
 
 /** Exception class for resource file handling errors.
  */
-_WRAP_GERROR(ResourceError, GResourceError, G_RESOURCE_ERROR, NO_GTYPE)
+_WRAP_GERROR(ResourceError, GResourceError, G_RESOURCE_ERROR, NO_GTYPE, newin "2,34")
 
-_WRAP_ENUM(ResourceFlags, GResourceFlags)
-_WRAP_ENUM(ResourceLookupFlags, GResourceLookupFlags)
+_WRAP_ENUM(ResourceFlags, GResourceFlags, newin "2,44")
+_WRAP_ENUM(ResourceLookupFlags, GResourceLookupFlags, newin "2,44")
 
 /** %Resource framework.
  *
@@ -134,13 +134,13 @@ class Resource
   _IGNORE(g_resource_ref, g_resource_unref)
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<Resource> create_from_data(const Glib::RefPtr<const Glib::Bytes>& data), 
g_resource_new_from_data, errthrow)
-  _WRAP_METHOD(static Glib::RefPtr<Resource> create_from_file(const std::string& filename), g_resource_load, 
errthrow)
-  _WRAP_METHOD(Glib::RefPtr<InputStream> open_stream(const std::string& path, ResourceLookupFlags 
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_open_stream, errthrow)
-  _WRAP_METHOD(Glib::RefPtr<const Glib::Bytes> lookup_data(const std::string& path, ResourceLookupFlags 
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_lookup_data, errthrow)
+  _WRAP_METHOD(static Glib::RefPtr<Resource> create_from_data(const Glib::RefPtr<const Glib::Bytes>& data), 
g_resource_new_from_data, errthrow, newin "2,44")
+  _WRAP_METHOD(static Glib::RefPtr<Resource> create_from_file(const std::string& filename), g_resource_load, 
errthrow, newin "2,44")
+  _WRAP_METHOD(Glib::RefPtr<InputStream> open_stream(const std::string& path, ResourceLookupFlags 
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_open_stream, errthrow, newin "2,44")
+  _WRAP_METHOD(Glib::RefPtr<const Glib::Bytes> lookup_data(const std::string& path, ResourceLookupFlags 
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_lookup_data, errthrow, newin "2,44")
 
 #m4 _CONVERSION(`char**',`std::vector<std::string>',`Glib::ArrayHandler<std::string>::array_to_vector($3, 
Glib::OWNERSHIP_DEEP)')
-  _WRAP_METHOD(std::vector<std::string> enumerate_children(const std::string& path, ResourceLookupFlags 
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_enumerate_children, errthrow)
+  _WRAP_METHOD(std::vector<std::string> enumerate_children(const std::string& path, ResourceLookupFlags 
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_enumerate_children, errthrow, newin "2,44")
 
   /** Looks for a file at the specified @a path in the resource and
    * if found returns information about it.
@@ -184,11 +184,11 @@ public:
   bool get_file_exists_nothrow(const std::string& path, ResourceLookupFlags lookup_flags = 
RESOURCE_LOOKUP_FLAGS_NONE) const;
 
   // 'register' is a keyword. Can't be the name of a method.
-  _WRAP_METHOD(void register_global(), g_resources_register)
-  _WRAP_METHOD(void unregister_global(), g_resources_unregister)
-  _WRAP_METHOD(static Glib::RefPtr<InputStream> open_stream_global(const std::string& path, 
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_open_stream, errthrow)
-  _WRAP_METHOD(static Glib::RefPtr<const Glib::Bytes> lookup_data_global(const std::string& path, 
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_lookup_data, errthrow)
-  _WRAP_METHOD(static std::vector<std::string> enumerate_children_global(const std::string& path, 
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_enumerate_children, errthrow)
+  _WRAP_METHOD(void register_global(), g_resources_register, newin "2,44")
+  _WRAP_METHOD(void unregister_global(), g_resources_unregister, newin "2,44")
+  _WRAP_METHOD(static Glib::RefPtr<InputStream> open_stream_global(const std::string& path, 
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_open_stream, errthrow, newin 
"2,44")
+  _WRAP_METHOD(static Glib::RefPtr<const Glib::Bytes> lookup_data_global(const std::string& path, 
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_lookup_data, errthrow, newin 
"2,44")
+  _WRAP_METHOD(static std::vector<std::string> enumerate_children_global(const std::string& path, 
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_enumerate_children, errthrow, 
newin "2,44")
 
   /** Looks for a file at the specified @a path in the set of
    * globally registered resources and if found returns information about it.
diff --git a/gio/src/tcpwrapperconnection.hg b/gio/src/tcpwrapperconnection.hg
index 1e1a943..9a9a8fd 100644
--- a/gio/src/tcpwrapperconnection.hg
+++ b/gio/src/tcpwrapperconnection.hg
@@ -31,7 +31,7 @@ namespace Gio
  * always return a Gio::SocketConnection, even when the connection it has
  * actually created is not directly a Gio::SocketConnection.
  *
- * @newin{2,34}
+ * @newin{2,44}
  * @ingroup NetworkIO
  */
 class TcpWrapperConnection : public Gio::TcpConnection
diff --git a/glib/src/binding.hg b/glib/src/binding.hg
index 7308f85..4a7eb2a 100644
--- a/glib/src/binding.hg
+++ b/glib/src/binding.hg
@@ -24,7 +24,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Glib
 {
-_WRAP_ENUM(BindingFlags, GBindingFlags)
+_WRAP_ENUM(BindingFlags, GBindingFlags, newin "2,44")
 
 /** Bind two object properties.
  *
@@ -354,13 +354,13 @@ public:
       slot_transform_from.empty() ? SlotTransform() : TransformProp<T_target, 
T_source>(slot_transform_from));
   }
 
-  _WRAP_METHOD(Glib::RefPtr<Glib::ObjectBase> get_source(), g_binding_get_source, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Glib::ObjectBase> get_source() const, g_binding_get_source, refreturn, 
constversion)
-  _WRAP_METHOD(Glib::ustring get_source_property() const, g_binding_get_source_property)
-  _WRAP_METHOD(Glib::RefPtr<Glib::ObjectBase> get_target(), g_binding_get_target, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Glib::ObjectBase> get_target() const, g_binding_get_target, refreturn, 
constversion)
-  _WRAP_METHOD(Glib::ustring get_target_property() const, g_binding_get_target_property)
-  _WRAP_METHOD(BindingFlags get_flags() const, g_binding_get_flags)
+  _WRAP_METHOD(Glib::RefPtr<Glib::ObjectBase> get_source(), g_binding_get_source, refreturn, newin "2,44")
+  _WRAP_METHOD(Glib::RefPtr<const Glib::ObjectBase> get_source() const, g_binding_get_source, refreturn, 
constversion, newin "2,44")
+  _WRAP_METHOD(Glib::ustring get_source_property() const, g_binding_get_source_property, newin "2,44")
+  _WRAP_METHOD(Glib::RefPtr<Glib::ObjectBase> get_target(), g_binding_get_target, refreturn, newin "2,44")
+  _WRAP_METHOD(Glib::RefPtr<const Glib::ObjectBase> get_target() const, g_binding_get_target, refreturn, 
constversion, newin "2,44")
+  _WRAP_METHOD(Glib::ustring get_target_property() const, g_binding_get_target_property, newin "2,44")
+  _WRAP_METHOD(BindingFlags get_flags() const, g_binding_get_flags, newin "2,44")
 
   /** Explicitly releases the binding between the source and the target
    * property expressed by this Binding instance.
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 604b195..b92d825 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -135,8 +135,8 @@ public:
 
   _WRAP_METHOD(gsize get_size() const, g_variant_get_size)
   _WRAP_METHOD(gconstpointer get_data(), g_variant_get_data, deprecated "Use the const version instead.")
-  _WRAP_METHOD(gconstpointer get_data() const, g_variant_get_data)
-  _WRAP_METHOD(Glib::RefPtr<const Glib::Bytes> get_data_as_bytes() const, g_variant_get_data_as_bytes)
+  _WRAP_METHOD(gconstpointer get_data() const, g_variant_get_data, newin "2,46")
+  _WRAP_METHOD(Glib::RefPtr<const Glib::Bytes> get_data_as_bytes() const, g_variant_get_data_as_bytes, newin 
"2,46")
   _WRAP_METHOD(void store(gpointer data) const, g_variant_store)
 
   _WRAP_METHOD(Glib::ustring print(bool type_annotate = false) const, g_variant_print)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]