[vala/0.40] girparser: Drop special handling of GLib.Data, GLib.PtrArray and GLib.String

[Rico Tzschichholz <ricotz src gnome org>]

commit b01f8c49bce287a37e579ec91a9871adff0d3677
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Apr 19 18:20:41 2020 +0200

    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 cc46a0d00..c85770f86 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2662,11 +2662,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;
                }
@@ -2777,14 +2772,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 512c0cec2..5784307e0 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -5266,6 +5266,7 @@ namespace GLib {
        /* Keyed Data Lists */
 
        [CCode (cname = "GData*", has_type_id = false)]
+       [GIR (name = "Data")]
        public struct Datalist<G> {
                public Datalist ();
                public void clear ();