From 8d9b0ab2a8ec1de79d1622651320e5ff14473e42 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 30 May 2018 11:02:55 +0200 Subject: [PATCH] atk: Drop vala-specific deprecations <= vala-0.22 --- vapi/atk.vapi | 75 ------------------------------- vapi/metadata/Atk-1.0-custom.vala | 71 ----------------------------- 2 files changed, 146 deletions(-) diff --git a/vapi/atk.vapi b/vapi/atk.vapi index 37f0a7c92..412dc6e15 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -201,12 +201,6 @@ namespace Atk { public Atk.RelationType get_relation_type (); public unowned GLib.GenericArray get_target (); public bool remove_target (Atk.Object target); - [Version (deprecated_since = "vala-0.16", replacement = "RelationType.for_name")] - public static Atk.RelationType type_for_name (string name); - [Version (deprecated_since = "vala-0.16", replacement = "RelationType.get_name")] - public static unowned string type_get_name (Atk.RelationType type); - [Version (deprecated_since = "vala-0.16", replacement = "RelationType.register")] - public static Atk.RelationType type_register (string name); [NoAccessorMethod] public Atk.RelationType relation_type { get; set; } [NoAccessorMethod] @@ -348,8 +342,6 @@ namespace Atk { public virtual int get_current_page_number (); [Version (deprecated = true)] public virtual void* get_document (); - [Version (deprecated_since = "vala-0.22", replacement = "Document.get_locale")] - public virtual unowned string get_document_locale (); [Version (deprecated = true)] public virtual unowned string get_document_type (); [CCode (vfunc_name = "get_document_locale")] @@ -482,14 +474,6 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h", type_id = "atk_text_get_type ()")] public interface Text : GLib.Object { public abstract bool add_selection (int start_offset, int end_offset); - [Version (deprecated_since = "vala-0.16", replacement = "TextAttribute.for_name")] - public static Atk.TextAttribute attribute_for_name (string name); - [Version (deprecated_since = "vala-0.16", replacement = "TextAttribute.get_name")] - public static unowned string attribute_get_name (Atk.TextAttribute attr); - [Version (deprecated_since = "vala-0.16", replacement = "TextAttribute.get_value")] - public static unowned string attribute_get_value (Atk.TextAttribute attr, int index_); - [Version (deprecated_since = "vala-0.16", replacement = "TextAttribute.register")] - public static Atk.TextAttribute attribute_register (string name); [Version (since = "1.3")] public static void free_ranges ([CCode (array_length = false)] Atk.TextRange[] ranges); [CCode (array_length = false, array_null_terminated = true, cname = "atk_text_get_bounded_ranges")] @@ -604,12 +588,6 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h")] [SimpleType] public struct State : uint64 { - [Version (deprecated_since = "vala-0.16", replacement = "StateType.for_name")] - public static Atk.StateType type_for_name (string name); - [Version (deprecated_since = "vala-0.16", replacement = "StateType.get_name")] - public static unowned string type_get_name (Atk.StateType type); - [Version (deprecated_since = "vala-0.16", replacement = "StateType.register")] - public static Atk.StateType type_register (string name); } [CCode (cheader_filename = "atk/atk.h", has_type_id = false)] public struct TextRectangle { @@ -679,8 +657,6 @@ namespace Atk { } [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_ROLE_", type_id = "atk_role_get_type ()")] public enum Role { - [Version (deprecated_since = "vala-0.22", replacement = "Role.ACCELERATOR_LABEL")] - ACCEL_LABEL, INVALID, [CCode (cname = "ATK_ROLE_ACCEL_LABEL")] ACCELERATOR_LABEL, @@ -1003,27 +979,9 @@ namespace Atk { [Version (since = "2.14")] public const int VERSION_MIN_REQUIRED; [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.add_focus_tracker")] - public static uint add_focus_tracker (Atk.EventListener focus_tracker); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.add_global_event_listener")] - public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.focus_tracker_init")] - public static void focus_tracker_init (Atk.EventListenerInit init); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.focus_tracker_notify")] - public static void focus_tracker_notify (Atk.Object object); - [CCode (cheader_filename = "atk/atk.h")] [Version (since = "2.8")] public static uint get_binary_age (); [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Registry.get_default.")] - public static unowned Atk.Registry get_default_registry (); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.get_focus_object")] - public static unowned Atk.Object get_focus_object (); - [CCode (cheader_filename = "atk/atk.h")] [Version (since = "2.8")] public static uint get_interface_age (); [CCode (cheader_filename = "atk/atk.h")] @@ -1035,37 +993,4 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h")] [Version (since = "2.8")] public static uint get_minor_version (); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.get_root")] - public static unowned Atk.Object get_root (); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.get_toolkit_name")] - public static unowned string get_toolkit_name (); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.get_toolkit_version")] - public static unowned string get_toolkit_version (); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.get_version")] - public static unowned string get_version (); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.remove_focus_tracker")] - public static void remove_focus_tracker (uint tracker_id); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.remove_global_event_listener")] - public static void remove_global_event_listener (uint listener_id); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Util.remove_key_event_listener")] - public static void remove_key_event_listener (uint listener_id); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Role.for_name")] - public static Atk.Role role_for_name (string name); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Role.get_localized_name")] - public static unowned string role_get_localized_name (Atk.Role role); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Role.get_name")] - public static unowned string role_get_name (Atk.Role role); - [CCode (cheader_filename = "atk/atk.h")] - [Version (deprecated_since = "vala-0.16", replacement = "Atk.Role.register")] - public static Atk.Role role_register (string name); } diff --git a/vapi/metadata/Atk-1.0-custom.vala b/vapi/metadata/Atk-1.0-custom.vala index 65411e7ba..e07985c79 100644 --- a/vapi/metadata/Atk-1.0-custom.vala +++ b/vapi/metadata/Atk-1.0-custom.vala @@ -2,11 +2,6 @@ namespace Atk { [Compact] public class AttributeSet : GLib.SList { } - [CCode (cheader_filename = "atk/atk.h", type_id = "atk_document_get_type ()")] - public interface Document : GLib.Object { - [Version (replacement = "Document.get_locale", deprecated_since = "vala-0.22")] - public virtual unowned string get_document_locale (); - } public interface Implementor : GLib.Object { public abstract unowned Atk.Object ref_accessible (); } @@ -16,78 +11,12 @@ namespace Atk { [Version (deprecated = true)] public weak GLib.HashTable factory_type_registry; } - public class Relation : GLib.Object { - [Version (replacement = "RelationType.for_name", deprecated_since = "vala-0.16")] - public static Atk.RelationType type_for_name (string name); - [Version (replacement = "RelationType.get_name", deprecated_since = "vala-0.16")] - public static unowned string type_get_name (Atk.RelationType type); - [Version (replacement = "RelationType.register", deprecated_since = "vala-0.16")] - public static Atk.RelationType type_register (string name); - } - [SimpleType] - public struct State : uint64 { - [Version (replacement = "StateType.for_name", deprecated_since = "vala-0.16")] - public static Atk.StateType type_for_name (string name); - [Version (replacement = "StateType.get_name", deprecated_since = "vala-0.16")] - public static unowned string type_get_name (Atk.StateType type); - [Version (replacement = "StateType.register", deprecated_since = "vala-0.16")] - public static Atk.StateType type_register (string name); - } public interface Text : GLib.Object { [Version (since = "1.3")] [CCode (array_length = false, array_null_terminated = true, cname = "atk_text_get_bounded_ranges")] public virtual Atk.TextRange[] get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type); - [Version (replacement = "TextAttribute.for_name", deprecated_since = "vala-0.16")] - public static Atk.TextAttribute attribute_for_name (string name); - [Version (replacement = "TextAttribute.get_name", deprecated_since = "vala-0.16")] - public static unowned string attribute_get_name (Atk.TextAttribute attr); - [Version (replacement = "TextAttribute.get_value", deprecated_since = "vala-0.16")] - public static unowned string attribute_get_value (Atk.TextAttribute attr, int index_); - [Version (replacement = "TextAttribute.register", deprecated_since = "vala-0.16")] - public static Atk.TextAttribute attribute_register (string name); - } - - [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_ROLE_", type_id = "atk_role_get_type ()")] - public enum Role { - [Version (replacement = "Role.ACCELERATOR_LABEL", deprecated_since = "vala-0.22")] - ACCEL_LABEL } [CCode (cname = "GSignalEmissionHook", has_target = false)] public delegate bool SignalEmissionHook (GLib.SignalInvocationHint ihint, [CCode (array_length_pos = 1.9)] Value[] param_values, void* data); - - [Version (replacement = "Atk.Util.add_focus_tracker", deprecated_since = "vala-0.16")] - public static uint add_focus_tracker (Atk.EventListener focus_tracker); - [Version (replacement = "Atk.Util.add_global_event_listener", deprecated_since = "vala-0.16")] - public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type); - [Version (replacement = "Atk.Util.focus_tracker_init", deprecated_since = "vala-0.16")] - public static void focus_tracker_init (Atk.EventListenerInit init); - [Version (replacement = "Atk.Util.focus_tracker_notify", deprecated_since = "vala-0.16")] - public static void focus_tracker_notify (Atk.Object object); - [Version (replacement = "Atk.Registry.get_default.", deprecated_since = "vala-0.16")] - public static unowned Atk.Registry get_default_registry (); - [Version (replacement = "Atk.Util.get_focus_object", deprecated_since = "vala-0.16")] - public static unowned Atk.Object get_focus_object (); - [Version (replacement = "Atk.Util.get_root", deprecated_since = "vala-0.16")] - public static unowned Atk.Object get_root (); - [Version (replacement = "Atk.Util.get_toolkit_name", deprecated_since = "vala-0.16")] - public static unowned string get_toolkit_name (); - [Version (replacement = "Atk.Util.get_toolkit_version", deprecated_since = "vala-0.16")] - public static unowned string get_toolkit_version (); - [Version (replacement = "Atk.Util.get_version", deprecated_since = "vala-0.16")] - public static unowned string get_version (); - [Version (replacement = "Atk.Util.remove_focus_tracker", deprecated_since = "vala-0.16")] - public static void remove_focus_tracker (uint tracker_id); - [Version (replacement = "Atk.Util.remove_global_event_listener", deprecated_since = "vala-0.16")] - public static void remove_global_event_listener (uint listener_id); - [Version (replacement = "Atk.Util.remove_key_event_listener", deprecated_since = "vala-0.16")] - public static void remove_key_event_listener (uint listener_id); - [Version (replacement = "Atk.Role.for_name", deprecated_since = "vala-0.16")] - public static Atk.Role role_for_name (string name); - [Version (replacement = "Atk.Role.get_localized_name", deprecated_since = "vala-0.16")] - public static unowned string role_get_localized_name (Atk.Role role); - [Version (replacement = "Atk.Role.get_name", deprecated_since = "vala-0.16")] - public static unowned string role_get_name (Atk.Role role); - [Version (replacement = "Atk.Role.register", deprecated_since = "vala-0.16")] - public static Atk.Role role_register (string name); } -- 2.47.2