[glibmm] Remove deprecated API.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glibmm] Remove deprecated API.
Date: Mon, 14 Nov 2016 09:44:43 +0000 (UTC)
commit 45cc8f8f8cb093a9e8aa8747af93c57941e1b32a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Nov 10 13:29:23 2016 +0100

    Remove deprecated API.

 gio/src/action.hg               |    4 --
 gio/src/actiongroup.hg          |    3 -
 gio/src/appinfo.hg              |    4 --
 gio/src/application.hg          |    5 +-
 gio/src/asyncresult.hg          |    8 +---
 gio/src/desktopappinfo.hg       |    4 +-
 gio/src/memoryinputstream.ccg   |   23 ---------
 gio/src/memoryinputstream.hg    |   21 --------
 gio/src/menuitem.ccg            |    8 ---
 gio/src/menuitem.hg             |    9 ----
 gio/src/notification.hg         |    2 +-
 gio/src/settings.ccg            |   10 ----
 gio/src/settings.hg             |   17 ++-----
 gio/src/simpleactiongroup.hg    |    6 +--
 gio/src/tlsconnection.hg        |    7 +--
 gio/src/unixsocketaddress.hg    |    2 +-
 gio/src/volumemonitor.hg        |    3 +-
 glib/glibmm.h                   |    1 -
 glib/glibmm/main.cc             |   24 ---------
 glib/src/date.ccg               |   18 -------
 glib/src/date.hg                |   18 -------
 glib/src/filelist.am            |    1 -
 glib/src/keyfile.hg             |    3 +-
 glib/src/miscutils.ccg          |    8 ---
 glib/src/miscutils.hg           |   22 --------
 glib/src/valuearray.ccg         |   99 -------------------------------------
 glib/src/valuearray.hg          |   95 ------------------------------------
 glib/src/variant.ccg            |    7 ---
 glib/src/variant.hg             |   24 ---------
 tests/Makefile.am               |    2 -
 tests/glibmm_valuearray/main.cc |  102 ---------------------------------------
 31 files changed, 16 insertions(+), 544 deletions(-)
---
diff --git a/gio/src/action.hg b/gio/src/action.hg
index a7ce66e..ffff582 100644
--- a/gio/src/action.hg
+++ b/gio/src/action.hg
@@ -134,8 +134,6 @@ public:
 
   _WRAP_METHOD(void change_state_variant(const Glib::VariantBase& value), g_action_change_state)
 
-  _WRAP_METHOD(void change_state(const Glib::VariantBase& value), g_action_change_state, deprecated "Use the 
templated method instead, passing a normal C++ type.")
-
   /** Queries the current state of the action.
    *
    * If the action is not stateful then a null Variant will be returned.  If the
@@ -172,8 +170,6 @@ public:
 
   _WRAP_METHOD(void activate_variant(const Glib::VariantBase& parameter), g_action_activate)
 
-  _WRAP_METHOD(void activate(const Glib::VariantBase& parameter), g_action_activate, deprecated "Use the 
templated method instead, passing a normal C++ type.")
-
   _WRAP_METHOD(static bool name_is_valid(const Glib::ustring& action_name), g_action_name_is_valid )
 
   /** Parses a detailed action name into its separate name and target components.
diff --git a/gio/src/actiongroup.hg b/gio/src/actiongroup.hg
index d8f9c10..5877e20 100644
--- a/gio/src/actiongroup.hg
+++ b/gio/src/actiongroup.hg
@@ -104,9 +104,6 @@ public:
 
   _WRAP_METHOD(Glib::VariantContainerBase get_action_state_hint_variant(const Glib::ustring& action_name) 
const, g_action_group_get_action_state_hint)
 
-
-  _WRAP_METHOD(Glib::VariantBase get_action_state(const Glib::ustring& action_name) const, 
g_action_group_get_action_state, deprecated "Use the get_action_state() method that takes an output parameter 
instead.")
-
   //TODO: How do we check for a nullptr Variant?
   /** Queries the current state of the named action within the action group.
    *
diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg
index 255dce6..238cc07 100644
--- a/gio/src/appinfo.hg
+++ b/gio/src/appinfo.hg
@@ -157,10 +157,6 @@ public:
   _WRAP_METHOD(bool supports_files() const, g_app_info_supports_files)
 
 #m4 _CONVERSION(`const Glib::ListHandle<std::string>&',`GList*',`$3.data()')
-  _WRAP_METHOD(bool launch_uris(const Glib::ListHandle<std::string>& uris,
-                                GAppLaunchContext* launch_context),
-               g_app_info_launch_uris,
-               errthrow, deprecated "Use the method that takes an AppLaunchContext")
 
   //TODO: I think we use Glib::ustring elsewhere for URIs:
   _WRAP_METHOD(bool launch_uris(const Glib::ListHandle<std::string>& uris,
diff --git a/gio/src/application.hg b/gio/src/application.hg
index 2d05118..ea752fe 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -164,8 +164,7 @@ public:
    */
   void unset_resource_base_path();
 
-  _WRAP_METHOD(void set_action_group(const Glib::RefPtr<ActionGroup>& action_group), 
g_application_set_action_group,
-    deprecated "Use the Gio::ActionMap interface instead.")
+  _IGNORE(g_application_set_action_group)
 
   //Note: We would like to add a group, not just some entries,
   //so we can do pre and post parsing. See https://bugzilla.gnome.org/show_bug.cgi?id=727602
@@ -359,7 +358,7 @@ public:
 //  _WRAP_METHOD(void bind_busy_property(const Glib::RefPtr<Glib::ObjectBase>& object, const Glib::ustring& 
property), g_application_bind_busy_property)
 //  _WRAP_METHOD(void unbind_busy_property(const Glib::RefPtr<Glib::ObjectBase>& object, const 
Glib::ustring& property), g_application_unbind_busy_property)
 
-  _WRAP_PROPERTY("action-group", Glib::RefPtr<ActionGroup>, deprecated "Use the Gio::ActionMap interface 
instead.")
+  _IGNORE_PROPERTY("action-group")
   _WRAP_PROPERTY("application-id", Glib::ustring)
   _WRAP_PROPERTY("flags", ApplicationFlags)
   _WRAP_PROPERTY("inactivity-timeout", guint)
diff --git a/gio/src/asyncresult.hg b/gio/src/asyncresult.hg
index 681b380..31b6a15 100644
--- a/gio/src/asyncresult.hg
+++ b/gio/src/asyncresult.hg
@@ -106,13 +106,7 @@ class AsyncResult : public Glib::Interface
 
 public:
   _IGNORE(g_async_result_get_user_data)
-
-  //Note that this returns a reference, unlike most GTK+ get_*() functions,
-  //so we don't need to use refreturn.
-  _WRAP_METHOD(Glib::RefPtr<Glib::Object> get_source_object(),
-               g_async_result_get_source_object, deprecated "Use get_source_object_base()")
-  _WRAP_METHOD(Glib::RefPtr<const Glib::Object> get_source_object() const,
-               g_async_result_get_source_object, constversion, deprecated "Use get_source_object_base()")
+  _IGNORE(g_async_result_get_source_object)
 
   //Note that this returns a reference, unlike most GTK+ get_*() functions,
   //so we don't need to use refreturn.
diff --git a/gio/src/desktopappinfo.hg b/gio/src/desktopappinfo.hg
index 9c08401..ba65428 100644
--- a/gio/src/desktopappinfo.hg
+++ b/gio/src/desktopappinfo.hg
@@ -55,8 +55,8 @@ public:
 
   _WRAP_METHOD(std::string get_filename() const, g_desktop_app_info_get_filename)
   _WRAP_METHOD(bool is_hidden() const, g_desktop_app_info_get_is_hidden)
-  _WRAP_METHOD(static void set_desktop_env(const std::string& desktop_env), 
g_desktop_app_info_set_desktop_env,
-    deprecated "Do not use this API. Since 2.42 the value of the `XDG_CURRENT_DESKTOP` environment variable 
will be used.")
+
+  _IGNORE(g_desktop_app_info_set_desktop_env)
 
 #m4 _CONVERSION(`const char* const*', `std::vector<Glib::ustring>', 
`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(std::vector<Glib::ustring> get_keywords() const, g_desktop_app_info_get_keywords)
diff --git a/gio/src/memoryinputstream.ccg b/gio/src/memoryinputstream.ccg
index e896528..9c5068c 100644
--- a/gio/src/memoryinputstream.ccg
+++ b/gio/src/memoryinputstream.ccg
@@ -62,29 +62,6 @@ destroy_data_callback(void* user_data)
 namespace Gio
 {
 
-_DEPRECATE_IFDEF_START
-void
-MemoryInputStream::add_data(const std::string& data)
-{
-  char* data_copy = g_strdup(data.c_str());
-  g_memory_input_stream_add_data(gobj(), data_copy, -1, g_free);
-}
-
-void
-MemoryInputStream::add_data(const void* data, gssize len)
-{
-  char* data_copy = nullptr;
-
-  // copy the data so that the caller doesn't need to keep the data alive
-  if (len < 0)
-    data_copy = g_strdup(static_cast<const gchar*>(data));
-  else
-    data_copy = static_cast<gchar*>(g_memdup(data, len));
-
-  g_memory_input_stream_add_data(gobj(), data_copy, len, g_free);
-}
-_DEPRECATE_IFDEF_END
-
 void
 MemoryInputStream::add_data(const void* data, gssize len, const SlotDestroyData& destroy_slot)
 {
diff --git a/gio/src/memoryinputstream.hg b/gio/src/memoryinputstream.hg
index 80bac20..156ab09 100644
--- a/gio/src/memoryinputstream.hg
+++ b/gio/src/memoryinputstream.hg
@@ -46,27 +46,6 @@ protected:
 public:
   _WRAP_CREATE()
 
-_DEPRECATE_IFDEF_START
-  /** Appends to data that can be read from the input stream.
-   *
-   * @param data Input data.
-   *
-   * @deprecated Use add_data() with SlotDestroyData or GDestroyNotify instead.
-   */
-  void add_data(const std::string& data);
-
-  /** Appends to data that can be read from the input stream.
-   *
-   * Note that the data will be copied internally and freed when no longer needed.
-   *
-   * @param data Input data.
-   * @param len Length of the data, may be -1 if data is a null-terminated string.
-   *
-   * @deprecated Use add_data() with SlotDestroyData or GDestroyNotify instead.
-   */
-  void add_data(const void* data, gssize len);
-_DEPRECATE_IFDEF_END
-
   _WRAP_METHOD(void add_data(const void* data, gssize len, GDestroyNotify destroy), 
g_memory_input_stream_add_data)
 
   /** For example,
diff --git a/gio/src/menuitem.ccg b/gio/src/menuitem.ccg
index 6912c05..2f6dc38 100644
--- a/gio/src/menuitem.ccg
+++ b/gio/src/menuitem.ccg
@@ -43,14 +43,6 @@ MenuItem::MenuItem(const Glib::RefPtr<MenuModel>& submenu) : _CONSTRUCT()
   set_submenu(submenu);
 }
 
-_DEPRECATE_IFDEF_START
-void
-MenuItem::set_action_and_target(const Glib::ustring& action)
-{
-  g_menu_item_set_action_and_target_value(gobj(), action.c_str(), nullptr);
-}
-_DEPRECATE_IFDEF_END
-
 void
 MenuItem::set_action(const Glib::ustring& action)
 {
diff --git a/gio/src/menuitem.hg b/gio/src/menuitem.hg
index 5590393..3830880 100644
--- a/gio/src/menuitem.hg
+++ b/gio/src/menuitem.hg
@@ -102,7 +102,6 @@ GMenuItem * g_menu_item_new_section                 (const Glib::ustring& label,
   //void set_attribute(const Glib::ustring& attribute, const T_Value& value) const;
 
   _WRAP_METHOD(void set_attribute_value(const Glib::ustring& attribute, const Glib::VariantBase& value), 
g_menu_item_set_attribute_value)
-  _WRAP_METHOD(void set_attribute(const Glib::ustring& attribute, const Glib::VariantBase& value), 
g_menu_item_set_attribute_value, deprecated "Use set_attribute() instead.")
   _IGNORE(g_menu_item_set_attribute)
 
 //These are documented as transfer-full, so we don't need to use refreturn.
@@ -120,19 +119,11 @@ GMenuItem * g_menu_item_new_section                 (const Glib::ustring& label,
   //void get_attribute(const Glib::ustring& attribute, T_Value& value) const;
   //_WRAP_METHOD(Glib::VariantBase get_attribute_value(const Glib::ustring& attribute, const 
Glib::VariantType& expected_type{?}) const, g_menu_item_get_attribute_value)
 
-  _WRAP_METHOD(Glib::VariantBase get_attribute(const Glib::ustring& attribute, const Glib::VariantType& 
expected_type{?}) const, g_menu_item_get_attribute_value, deprecated "Use get_attribute_value() instead.")
   _WRAP_METHOD(Glib::VariantBase get_attribute_value(const Glib::ustring& attribute, const 
Glib::VariantType& expected_type{?}) const, g_menu_item_get_attribute_value)
 
   // Ignore varargs function.
   _IGNORE(g_menu_item_get_attribute)
 
-_DEPRECATE_IFDEF_START
-  /** Unsets the target for the specified @a action.
-   * @deprecated Use set_action() or unset_target() instead.
-   */
-  void set_action_and_target(const Glib::ustring& action);
-_DEPRECATE_IFDEF_END
-
   /** Sets the action for the menu item.
    * See set_action_and_target().
    *
diff --git a/gio/src/notification.hg b/gio/src/notification.hg
index df9a7ee..de15fcf 100644
--- a/gio/src/notification.hg
+++ b/gio/src/notification.hg
@@ -71,7 +71,7 @@ public:
   _WRAP_METHOD(void set_title(const Glib::ustring& title), g_notification_set_title)
   _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.")
+  _IGNORE(g_notification_set_urgent)
   _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/settings.ccg b/gio/src/settings.ccg
index 3ec8691..b5f33ef 100644
--- a/gio/src/settings.ccg
+++ b/gio/src/settings.ccg
@@ -66,14 +66,4 @@ Settings::bind_writable(
   bind_writable(key, property_proxy.get_object(), property_proxy.get_name(), inverted);
 }
 
-_DEPRECATE_IFDEF_START
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-std::vector<Glib::ustring>
-Settings::list_schemas()
-{
-  return Glib::ArrayHandler<Glib::ustring>::array_to_vector(
-    g_settings_list_schemas(), Glib::OWNERSHIP_NONE);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-_DEPRECATE_IFDEF_END
 }
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index dbdbf20..b886b2b 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -136,7 +136,7 @@ public:
   _WRAP_METHOD(gint64 get_int64(const Glib::ustring& key) const, g_settings_get_int64)
   _WRAP_METHOD(void set_int64(const Glib::ustring& key, gint64 value), g_settings_set_int64)
   _WRAP_METHOD(guint get_uint(const Glib::ustring& key) const, g_settings_get_uint)
-  _WRAP_METHOD(void set_uiint(const Glib::ustring& key, guint value), g_settings_set_uint, deprecated "Use 
set_uint() instead.")
+  _IGNORE(g_settings_set_uint)
   _WRAP_METHOD(void set_uint(const Glib::ustring& key, guint value), g_settings_set_uint)
   _WRAP_METHOD(guint64 get_uint64(const Glib::ustring& key) const, g_settings_get_uint64)
   _WRAP_METHOD(void set_uint64(const Glib::ustring& key, guint64 value), g_settings_set_uint64)
@@ -171,22 +171,13 @@ public:
 
   _WRAP_METHOD(void reset(const Glib::ustring& key), g_settings_reset)
 
-_DEPRECATE_IFDEF_START
-//We must hand-code this because gmmproc is confused by the static keyword with the vector.
-//#m4 _CONVERSION(`const 
gchar*const*',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, 
Glib::OWNERSHIP_NONE)')
-  _WRAP_METHOD_DOCS_ONLY(g_settings_list_schemas)
-  static std::vector<Glib::ustring> list_schemas();
-  _IGNORE(g_settings_list_schemas)
-_DEPRECATE_IFDEF_END
-
 #m4 
_CONVERSION(`gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, 
Glib::OWNERSHIP_DEEP)')
   _WRAP_METHOD(std::vector<Glib::ustring> list_children() const, g_settings_list_children)
-  _WRAP_METHOD(std::vector<Glib::ustring> list_keys() const, g_settings_list_keys, deprecated "Use 
SettingsSchema::list_kes().")
+  _IGNORE(g_settings_list_keys)
 
   _IGNORE(g_settings_get_range, g_settings_list_relocatable_schemas) // deprecated
 
-  _WRAP_METHOD(bool range_check(const Glib::ustring& key, const Glib::VariantBase& value) const, 
g_settings_range_check,
-    deprecated "Use g_settings_schema_key_range_check() instead.")
+  _IGNORE(g_settings_range_check)
   //TODO: Wrap GSettingsSchema
 
 #m4 _CONVERSION(`Glib::ObjectBase*',`gpointer',(gpointer)$3->gobj())
@@ -204,7 +195,7 @@ _DEPRECATE_IFDEF_END
   _WRAP_PROPERTY("delay-apply", bool)
   _WRAP_PROPERTY("has-unapplied", bool)
   _WRAP_PROPERTY("path", std::string)
-  _WRAP_PROPERTY("schema", Glib::ustring, deprecated "Use the 'schema-id' property instead. In a future 
version, this property may instead refer to a SettingsSchema.")
+  _IGNORE_PROPERTY("schema")
   _WRAP_PROPERTY("schema-id", Glib::ustring)
 
   //TODO: _WRAP_PROPERTY("settings-schema", Glib::RefPtr<SettingsSchema>)
diff --git a/gio/src/simpleactiongroup.hg b/gio/src/simpleactiongroup.hg
index 0c3fc8c..36dd91b 100644
--- a/gio/src/simpleactiongroup.hg
+++ b/gio/src/simpleactiongroup.hg
@@ -49,11 +49,7 @@ public:
   _WRAP_METHOD_DOCS_ONLY(g_simple_action_group_new)
   _WRAP_CREATE()
 
-  _WRAP_METHOD(Glib::RefPtr<Action> lookup(const Glib::ustring& action_name), g_simple_action_group_lookup, 
refreturn, deprecated "Use ActionMap::lookup_action() instead")
-  _WRAP_METHOD(Glib::RefPtr<const Action> lookup(const Glib::ustring& action_name) const, 
g_simple_action_group_lookup, refreturn, constversion, deprecated "Use ActionMap::lookup_action() instead")
-
-  _WRAP_METHOD(void insert(const Glib::RefPtr<Action>& action), g_simple_action_group_insert, deprecated 
"Use ActionMap::add_action() instead")
-  _WRAP_METHOD(void remove(const Glib::ustring& action_name), g_simple_action_group_remove, deprecated "Use 
ActionMap::remove_action() instead")
+  _IGNORE(g_simple_action_group_lookup, g_simple_action_group_insert, g_simple_action_group_remove)
 
   _IGNORE(g_simple_action_group_add_entries) // deprecated
 };
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index 80852f1..319c052 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -64,10 +64,7 @@ public:
   _WRAP_METHOD(void set_rehandshake_mode(TlsRehandshakeMode mode), g_tls_connection_set_rehandshake_mode)
   _WRAP_METHOD(TlsRehandshakeMode get_rehandshake_mode() const, g_tls_connection_get_rehandshake_mode)
 
-  _WRAP_METHOD(void set_use_system_certdb(bool use_system_certdb = true), 
g_tls_connection_set_use_system_certdb,
-    deprecated "Use set_database() instead.")
-  _WRAP_METHOD(bool get_use_system_certdb() const, g_tls_connection_get_use_system_certdb,
-    deprecated "Use get_database() instead.")
+  _IGNORE(g_tls_connection_set_use_system_certdb, g_tls_connection_get_use_system_certdb)
 
   _WRAP_METHOD(Glib::RefPtr<TlsDatabase> get_database(), g_tls_connection_get_database)
   _WRAP_METHOD(Glib::RefPtr<const TlsDatabase> get_database() const, g_tls_connection_get_database, 
constversion)
@@ -94,7 +91,7 @@ public:
   _WRAP_PROPERTY("peer-certificate-errors", TlsCertificateFlags)
   _WRAP_PROPERTY("rehandshake-mode", TlsRehandshakeMode)
   _WRAP_PROPERTY("require-close-notify", bool)
-  _WRAP_PROPERTY("use-system-certdb", bool, deprecated "Use property_database() instead.")
+  _IGNORE_PROPERTY("use-system-certdb")
 
 #m4 _CONVERSION(`GTlsCertificate*',`const Glib::RefPtr<const TlsCertificate>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(bool accept_certificate(const Glib::RefPtr<const TlsCertificate>& peer_cert, 
TlsCertificateFlags errors), "accept_certificate")
diff --git a/gio/src/unixsocketaddress.hg b/gio/src/unixsocketaddress.hg
index e3e4170..cea8669 100644
--- a/gio/src/unixsocketaddress.hg
+++ b/gio/src/unixsocketaddress.hg
@@ -82,7 +82,7 @@ public:
 
  _WRAP_METHOD(static bool abstract_names_supported(), g_unix_socket_address_abstract_names_supported)
 
-  _WRAP_PROPERTY("abstract", bool, deprecated "Use property_address_type() instead, which distinguishes 
between zero-padded and non-zero-padded abstract addresses.")
+  _IGNORE_PROPERTY("abstract")
   _WRAP_PROPERTY("address-type", UnixSocketAddressType)
   _WRAP_PROPERTY("path", std::string)
   _WRAP_PROPERTY("path-as-array", Glib::RefPtr<ByteArray>)
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index df32646..f12976f 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -55,8 +55,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Volume> get_volume_for_uuid(const std::string& uuid), 
g_volume_monitor_get_volume_for_uuid, refreturn)
   _WRAP_METHOD(Glib::RefPtr<Mount> get_mount_for_uuid(const std::string& uuid), 
g_volume_monitor_get_mount_for_uuid, refreturn)
 
-  _WRAP_METHOD(static Glib::RefPtr<Volume> adopt_orphan_mount(const Glib::RefPtr<Mount>& mount), 
g_volume_monitor_adopt_orphan_mount,
-    deprecated "Instead of using this function, create shadow mounts with the URI of the mount you intend to 
adopt.")
+  _IGNORE(g_volume_monitor_adopt_orphan_mount)
 
 #m4 _CONVERSION(`GVolume*',`const Glib::RefPtr<Volume>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(void volume_added(const Glib::RefPtr<Volume>& volume), volume_added)
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 79d3e1d..153d65e 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -140,7 +140,6 @@
 #include <glibmm/uriutils.h>
 #include <glibmm/ustring.h>
 #include <glibmm/value.h>
-#include <glibmm/valuearray.h>
 #include <glibmm/variant.h>
 #include <glibmm/variantdict.h>
 #include <glibmm/variantiter.h>
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index f549e02..27464d3 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -26,7 +26,6 @@
 
 namespace
 {
-#ifdef GLIBMM_DISABLE_DEPRECATED
 void
 time64_to_time_val(gint64 time64, Glib::TimeVal& time_val)
 {
@@ -36,7 +35,6 @@ time64_to_time_val(gint64 time64, Glib::TimeVal& time_val)
     static_cast<long>(time64 - static_cast<gint64>(seconds) * G_GINT64_CONSTANT(1000000));
   time_val = Glib::TimeVal(seconds, microseconds);
 }
-#endif // GLIBMM_DISABLE_DEPRECATED
 
 // TODO: At the next ABI break, replace ExtraSourceData by new data members in Source.
 // Then the mutex is not necessary, but to keep the code thread-safe, use the
@@ -1007,16 +1005,6 @@ Source::remove_poll(Glib::PollFD& poll_fd)
   g_source_remove_poll(gobject_, poll_fd.gobj());
 }
 
-#ifndef GLIBMM_DISABLE_DEPRECATED
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-void
-Source::get_current_time(Glib::TimeVal& current_time)
-{
-  g_source_get_current_time(gobject_, &current_time);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif // GLIBMM_DISABLE_DEPRECATED
-
 gint64
 Source::get_time() const
 {
@@ -1169,11 +1157,7 @@ bool
 TimeoutSource::prepare(int& timeout)
 {
   Glib::TimeVal current_time;
-#ifndef GLIBMM_DISABLE_DEPRECATED
-  get_current_time(current_time);
-#else
   time64_to_time_val(get_time(), current_time);
-#endif // GLIBMM_DISABLE_DEPRECATED
 
   Glib::TimeVal remaining = expiration_;
   remaining.subtract(current_time);
@@ -1210,11 +1194,7 @@ bool
 TimeoutSource::check()
 {
   Glib::TimeVal current_time;
-#ifndef GLIBMM_DISABLE_DEPRECATED
-  get_current_time(current_time);
-#else
   time64_to_time_val(get_time(), current_time);
-#endif // GLIBMM_DISABLE_DEPRECATED
 
   return (expiration_ <= current_time);
 }
@@ -1226,11 +1206,7 @@ TimeoutSource::dispatch(sigc::slot_base* slot)
 
   if (again)
   {
-#ifndef GLIBMM_DISABLE_DEPRECATED
-    get_current_time(expiration_);
-#else
     time64_to_time_val(get_time(), expiration_);
-#endif // GLIBMM_DISABLE_DEPRECATED
     expiration_.add_milliseconds(std::min<unsigned long>(G_MAXLONG, interval_));
   }
 
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index 4f15dda..ad23886 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -76,24 +76,6 @@ Date::set_parse(const Glib::ustring& str)
   g_date_set_parse(&gobject_, str.c_str());
 }
 
-_DEPRECATE_IFDEF_START
-
-// Avoid a build problem in the case that std::time_t is equivalent to gint32 (GTime is also gint32)
-// That would make the set_time() method overload impossible.
-#ifdef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-void
-Date::set_time(GTime time)
-{
-  // This method, and the C function g_date_set_time() that it wraps, are deprecated.
-  //(::time_t is used here instead of std::time_t, since the C function is declared
-  // with ::time_t. It's not important. The C++ standard requires that ::time_t
-  // and std::time_t shall be identical when both are defined.)
-  g_date_set_time_t(&gobject_, static_cast<time_t>(time));
-}
-#endif // GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-
-_DEPRECATE_IFDEF_END
-
 void
 Date::set_time(std::time_t timet)
 {
diff --git a/glib/src/date.hg b/glib/src/date.hg
index 228272a..e5c0ca6 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -109,24 +109,6 @@ public:
    */
   void set_parse (const Glib::ustring& str);
 
-
-  _DEPRECATE_IFDEF_START
-
-  //Avoid a build problem in the case that std::time_t is equivalent to gint32 (GTime is also gint32)
-  //That would make the set_time() method overload impossible.
-  #ifdef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-  /** Sets the value of a date from a GTime value.
-   *
-   * @param time GTime value to set.
-   *
-   * @deprecated Please use set_time(std::time_t) or set_time(const GTimeVal&).
-   */
-  void set_time(GTime time);
-  #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-
-  _DEPRECATE_IFDEF_END
-
-
   /** Sets the value of a date from a <type>std::time_t</type> value.
    *
    * @param timet std::time_t value to set
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index a8c2c40..78bb944 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -39,7 +39,6 @@ glibmm_files_any_hg =         \
        timezone.hg             \
        unicode.hg              \
        uriutils.hg             \
-       valuearray.hg \
        variant.hg              \
        variantdict.hg          \
        variantiter.hg          \
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index c43ccb0..41c2de2 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -142,8 +142,7 @@ public:
 #m4 _CONVERSION(`const Glib::ArrayHandle<std::string>&', `const gchar**', `const_cast<const 
gchar**>($3.data())')
 #m4 _CONVERSION(`Glib::ArrayHandle<std::string>&', `gchar**', `const_cast<gchar**>($3.data())')
 
-  _WRAP_METHOD(bool load_from_dirs(const std::string& file, const Glib::ArrayHandle<std::string>& 
search_dirs, Glib::ArrayHandle<std::string>& full_path, KeyFileFlags flags = Glib::KEY_FILE_NONE),
-    g_key_file_load_from_dirs, errthrow, deprecated "Use the load_from_dirs() method that takes a 
std::string& full_path.")
+  _IGNORE(g_key_file_load_from_dirs)
 
   _WRAP_METHOD_DOCS_ONLY(g_key_file_load_from_dirs)
   bool load_from_dirs(const std::string& file, const Glib::ArrayHandle<std::string>& search_dirs, 
std::string& full_path, KeyFileFlags flags = Glib::KEY_FILE_NONE);
diff --git a/glib/src/miscutils.ccg b/glib/src/miscutils.ccg
index a6754c3..4d2f331 100644
--- a/glib/src/miscutils.ccg
+++ b/glib/src/miscutils.ccg
@@ -117,14 +117,6 @@ get_current_dir()
   return convert_return_gchar_ptr_to_stdstring(g_get_current_dir());
 }
 
-#ifndef GLIBMM_DISABLE_DEPRECATED
-std::string
-get_user_special_dir(GUserDirectory directory)
-{
-  return convert_const_gchar_ptr_to_stdstring(g_get_user_special_dir(directory));
-}
-#endif // GLIBMM_DISABLE_DEPRECATED
-
 std::string
 get_user_special_dir(UserDirectory directory)
 {
diff --git a/glib/src/miscutils.hg b/glib/src/miscutils.hg
index f4833f5..63040c0 100644
--- a/glib/src/miscutils.hg
+++ b/glib/src/miscutils.hg
@@ -165,28 +165,6 @@ std::string get_tmp_dir();
  */
 std::string get_current_dir();
 
-#ifndef GLIBMM_DISABLE_DEPRECATED
-/** Returns the full path of a special directory using its logical id.
- *
- * On Unix this is done using the XDG special user directories.
- * For compatibility with existing practise, G_USER_DIRECTORY_DESKTOP
- * falls back to `$HOME/Desktop` when XDG special user directories have
- * not been set up.
- *
- * Depending on the platform, the user might be able to change the path
- * of the special directory without requiring the session to restart; GLib
- * will not reflect any change once the special directories are loaded.
- *
- * @param directory The logical id of special directory.
- * @return The path to the specified special directory, or an empty string
- *         if the logical id was not found.
- *
- * @newin{2,14}
- * @deprecated Use get_user_special_dir(Glib::UserDirectory directory) instead.
- */
-std::string get_user_special_dir(GUserDirectory directory);
-#endif // GLIBMM_DISABLE_DEPRECATED
-
 /** Returns the full path of a special directory using its logical id.
  *
  * On Unix this is done using the XDG special user directories.
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg
index d70af54..37576c0 100644
--- a/glib/src/variant.ccg
+++ b/glib/src/variant.ccg
@@ -249,13 +249,6 @@ VariantContainerBase::get_iter(const VariantType& container_variant_type) const
 
 /****************** Specializations ***********************************/
 
-_DEPRECATE_IFDEF_START
-VariantBase::operator const void*() const
-{
-  return gobj() ? GINT_TO_POINTER(1) : nullptr;
-}
-_DEPRECATE_IFDEF_END
-
 VariantBase::operator bool() const
 {
   return gobj() ? GINT_TO_POINTER(1) : nullptr;
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index f855db7..7749a34 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -95,29 +95,6 @@ class VariantBase
     g_variant_get, g_variant_get_va)
 public:
 
-_DEPRECATE_IFDEF_START
-  /** This typedef is just to make it more obvious that
-   * our operator const void* should be used like operator bool().
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   */
-  using BoolExpr = const void*;
-
-  /** Test whether the Variant has an underlying instance.
-   *
-   * Mimics usage of pointers:
-   * @code
-   *   if (variant)
-   *     do_something();
-   * @endcode
-   *
-   * @deprecated Use the explicit operator bool() instead.
-   *
-   * @newin{2,36}
-   */
-   operator BoolExpr() const;
-_DEPRECATE_IFDEF_END
-
    /** Test whether the Variant has an underlying instance.
     *
     * @newin{2,50}
@@ -146,7 +123,6 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(GVariantClass classify() const, g_variant_classify)
 
   _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, 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)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00d7cba..0db1869 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,7 +38,6 @@ check_PROGRAMS =                              \
        glibmm_ustring_compose/test             \
        glibmm_ustring_format/test              \
        glibmm_value/test                       \
-       glibmm_valuearray/test                  \
        glibmm_variant/test                     \
        glibmm_vector/test                      \
        glibmm_bool_vector/test                 \
@@ -106,7 +105,6 @@ glibmm_objectbase_move_test_SOURCES      = glibmm_objectbase_move/main.cc
 glibmm_ustring_compose_test_SOURCES      = glibmm_ustring_compose/main.cc
 glibmm_ustring_format_test_SOURCES       = glibmm_ustring_format/main.cc
 glibmm_value_test_SOURCES                = glibmm_value/glibmm_value.cc glibmm_value/main.cc
-glibmm_valuearray_test_SOURCES           = glibmm_valuearray/main.cc
 glibmm_variant_test_SOURCES              = glibmm_variant/main.cc
 glibmm_vector_test_SOURCES               = glibmm_vector/main.cc
 glibmm_vector_test_LDADD                 = $(giomm_ldadd)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]