From bcc6d149e27b954a0973f1643996f5ffd8a765a9 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 19 Apr 2020 18:20:41 +0200 Subject: [PATCH] girparser: Drop special handling of GLib.Data, GLib.PtrArray and GLib.String --- vala/valagirparser.vala | 9 --------- vapi/glib-2.0.vapi | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala index 6a1ba6caf..1b94e546d 100644 --- a/vala/valagirparser.vala +++ b/vala/valagirparser.vala @@ -2674,11 +2674,6 @@ public class Vala.GirParser : CodeVisitor { next (); - if (type_name == "GLib.PtrArray" - && current_token == MarkupTokenType.START_ELEMENT) { - type_name = "GLib.GenericArray"; - } - if (type_name == null) { type_name = ctype; } @@ -2789,14 +2784,10 @@ public class Vala.GirParser : CodeVisitor { type_name = "intptr"; } else if (type_name == "GType") { type_name = "GLib.Type"; - } else if (type_name == "GLib.String") { - type_name = "GLib.StringBuilder"; } else if (type_name == "GObject.Class") { type_name = "GLib.ObjectClass"; } else if (type_name == "gunichar") { type_name = "unichar"; - } else if (type_name == "GLib.Data") { - type_name = "GLib.Datalist"; } else if (type_name == "Atk.ImplementorIface") { type_name = "Atk.Implementor"; } else { diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index 32f4fffce..c3df0f7ec 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -5448,6 +5448,7 @@ namespace GLib { /* Keyed Data Lists */ [CCode (cname = "GData*", has_type_id = false)] + [GIR (name = "Data")] public struct Datalist { public Datalist (); public void clear (); -- 2.47.2