gee-0.8

diff --git a/configure.ac b/configure.ac
index 5260732724cf1eadf990bba56e4607598876b750..a8fc5543a0b177ee89aa87d9e68fa69442f47231 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_PROG_LIBTOOL
 ##
 
 VALA_REQUIRED=0.13.2
-LIBGEE_REQUIRED=0.5
+LIBGEE_REQUIRED=0.8.0
 LIBGVC_REQUIRED=2.16
 GLIB_REQUIRED=2.12.0
 LIBGDKPIXBUF_REQUIRED=2.0
@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-PKG_CHECK_MODULES(LIBGEE, gee-1.0 >= $LIBGEE_REQUIRED)
+PKG_CHECK_MODULES(LIBGEE, gee-0.8 >= $LIBGEE_REQUIRED)
 AC_SUBST(LIBGEE_CFLAGS)
 AC_SUBST(LIBGEE_LIBS)
 

diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 8cbd65060d278e1ec33541047d4189eae1b71427..e7c2446290532ff0b85938592e0cadb6708ba84e 100644 (file)
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -36,7 +36,7 @@ libdoclet_la_SOURCES =      \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-0.8 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/doclets/gtkdoc/Makefile.am b/src/doclets/gtkdoc/Makefile.am
index b0ba3e0ca48f6578c9bfb7454e3ff0a92031cf10..66dcc5576fd6309ce0cadab3da959d1f2bff8914 100644 (file)
--- a/src/doclets/gtkdoc/Makefile.am
+++ b/src/doclets/gtkdoc/Makefile.am
@@ -41,7 +41,7 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-0.8 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/doclets/gtkdoc/gcomment.vala b/src/doclets/gtkdoc/gcomment.vala
index 4e683cac15debae6ceabe9f7a8e43a3c3f7fb9da..ae86792b1eb794e0e9dadce5fb9cbbfb1baab484 100644 (file)
--- a/src/doclets/gtkdoc/gcomment.vala
+++ b/src/doclets/gtkdoc/gcomment.vala
@@ -69,7 +69,7 @@ public class Gtkdoc.GComment {
                        builder.append_printf ("\n * @short_description: %s", commentize (brief_comment));
                }
 
-               headers.sort ((CompareFunc) Header.cmp);
+               headers.sort ((CompareDataFunc) Header.cmp);
                foreach (var header in headers) {
                        builder.append_printf ("\n * @%s:", header.name);
                        if (header.annotations != null && header.annotations.length > 0) {
@@ -78,7 +78,7 @@ public class Gtkdoc.GComment {
                                }
                                builder.append_c (':');
                        }
-                       
+
                        if (header.value != null) {
                                builder.append_c (' ');
                                builder.append (commentize (header.value));
@@ -165,7 +165,7 @@ public class Gtkdoc.GComment {
                        builder.append (long_comment);
                }
 
-               headers.sort ((CompareFunc) Header.cmp);
+               headers.sort ((CompareDataFunc) Header.cmp);
                if (headers.size > 0 || returns != null) {
                        builder.append ("""<variablelist role="params">""");
                        foreach (var header in headers) {

diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 75161b8eec5e567dc24866fb1aa15d4b1c156c82..5f3be836e2ef4d63fbb90517357c37b97fb991c5 100644 (file)
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -36,7 +36,7 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-0.8 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/driver/0.10.x/Makefile.am b/src/driver/0.10.x/Makefile.am
index 9c285fda44a1bb84c155f8aeeffbb08b3e282a82..25e7289900a8e352aa10960c5998fec822b6ef21 100644 (file)
--- a/src/driver/0.10.x/Makefile.am
+++ b/src/driver/0.10.x/Makefile.am
@@ -43,7 +43,7 @@ libdriver_la_SOURCES =      \
 
 
 libdriver.vala.stamp: $(libdriver_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg vala-0.10 --pkg gee-1.0 --pkg valadoc-1.0 --vapidir $(VERSIONED_VAPI_DIR) --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg vala-0.10 --pkg gee-0.8 --pkg valadoc-1.0 --vapidir $(VERSIONED_VAPI_DIR) --basedir . $^
        touch $@
 
 

diff --git a/src/driver/0.12.x/Makefile.am b/src/driver/0.12.x/Makefile.am
index 1c99d1d73e4fff4a2b9a712226b51b08978bd406..00447b35ac85d96b1f1ec70e1e9b651a14c09c65 100644 (file)
--- a/src/driver/0.12.x/Makefile.am
+++ b/src/driver/0.12.x/Makefile.am
@@ -52,7 +52,7 @@ libdriver_la_SOURCES =      \
 
 
 libdriver.vala.stamp: $(libdriver_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg $(VALA_PACKAGE_NAME) --pkg gee-1.0 --pkg valadoc-1.0 --vapidir $(VERSIONED_VAPI_DIR) --basedir . -D $(VALARUNTIMEFLAGS) $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg $(VALA_PACKAGE_NAME) --pkg gee-0.8 --pkg valadoc-1.0 --vapidir $(VERSIONED_VAPI_DIR) --basedir . -D $(VALARUNTIMEFLAGS) $^
        touch $@
 
 

diff --git a/src/driver/0.14.x/Makefile.am b/src/driver/0.14.x/Makefile.am
index 2e4fe6cf884a14ab180588bd45551aa7fe17cacd..07c4c9506260067405e4a3c706627009dcb95f16 100644 (file)
--- a/src/driver/0.14.x/Makefile.am
+++ b/src/driver/0.14.x/Makefile.am
@@ -52,7 +52,7 @@ libdriver_la_SOURCES =      \
 
 
 libdriver.vala.stamp: $(libdriver_la_VALASOURCES)
-       $(VALAC) $(VALA_FLAGS) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/libvaladoc --pkg libvala-0.14 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $(VALA_FLAGS) $^
+       $(VALAC) $(VALA_FLAGS) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/libvaladoc --pkg libvala-0.14 --pkg gee-0.8 --pkg valadoc-1.0 --basedir . $(VALA_FLAGS) $^
        touch $@
 
 

diff --git a/src/driver/0.16.x/Makefile.am b/src/driver/0.16.x/Makefile.am
index b390213baaadb6dca8aa3c110c5a872208cfaa89..c33cc9f74fe4f47951e98e2ecb9bad3f5f5f301e 100644 (file)
--- a/src/driver/0.16.x/Makefile.am
+++ b/src/driver/0.16.x/Makefile.am
@@ -51,7 +51,7 @@ libdriver_la_SOURCES =      \
 
 
 libdriver.vala.stamp: $(libdriver_la_VALASOURCES)
-       $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg libvala-0.16 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg libvala-0.16 --pkg gee-0.8 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/driver/0.18.x/Makefile.am b/src/driver/0.18.x/Makefile.am
index ad64d182081d67d50311ce6a7b13e16e96c66af1..d626a7f730c131e6dddf0ccdd3f38e32edb31f38 100644 (file)
--- a/src/driver/0.18.x/Makefile.am
+++ b/src/driver/0.18.x/Makefile.am
@@ -57,7 +57,7 @@ libdriver_la_SOURCES =      \
 
 
 libdriver.vala.stamp: $(libdriver_la_VALASOURCES)
-       $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg libvala-0.18 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg libvala-0.18 --pkg gee-0.8 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index def301777626190ab5746ca46bb76a81cb38fc9d..5b81e1f429b8514da8e61d3676e42acc8c9e3701 100644 (file)
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -173,7 +173,7 @@ libvaladocincludedir = $(includedir)/
 
 
 libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
-       $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-1.0 --pkg libgvc --pkg gmodule-2.0 --pkg libgvc --vapidir $(top_srcdir)/src/vapi --pkg config --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^
+       $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-0.8 --pkg libgvc --pkg gmodule-2.0 --pkg libgvc --vapidir $(top_srcdir)/src/vapi --pkg config --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^
        touch $@
 
 

diff --git a/src/libvaladoc/api/node.vala b/src/libvaladoc/api/node.vala
index c97d3668991402055b606bcd6e299fc22d7ab70f..9b2cee7feb4abf241333bd6d4796ce8141ab946a 100644 (file)
--- a/src/libvaladoc/api/node.vala
+++ b/src/libvaladoc/api/node.vala
@@ -48,15 +48,15 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara
         */
        public abstract NodeType node_type { get; }
 
-       private Map<string,Node> per_name_children;
-       private Map<NodeType?, Gee.List<Node>> per_type_children;
+       private Map<string, Node> per_name_children;
+       private Map<NodeType, Gee.List<Node>> per_type_children;
 
 
        public Node (Node? parent, SourceFile? file, string? name, void* data) {
                base (data);
 
-               per_name_children = new HashMap<string,Node> ();
-               per_type_children = new HashMap<NodeType?, Gee.List<Node>> (int_hash, int_equal);
+               per_name_children = new HashMap<string, Node> ();
+               per_type_children = new HashMap<NodeType, Gee.List<Node>> ();
 
                if (name != null && (is_keyword (name) || name[0].isdigit ())) {
                        this.name = "@" + name;

diff --git a/src/libvaladoc/api/package.vala b/src/libvaladoc/api/package.vala
index 85be9bd8356a4ab7fad78c578523422edaeb0dce..8c2cad18461a471ba47f32c76829747a673dbd52 100644 (file)
--- a/src/libvaladoc/api/package.vala
+++ b/src/libvaladoc/api/package.vala
@@ -85,27 +85,7 @@ public class Valadoc.Api.Package : Node {
 
        internal void register_deprecated_symbol (Symbol symbol, string? version) {
                if (deprecated == null) {
-                       // some libgee-versions do not like nullable strings
-
-                       EqualFunc<string?> str_eq0 = (a, b) => { 
-                               if (a == null && b == null) {
-                                       return true;
-                               } else if (a == null || b == null) {
-                                       return false;
-                               }
-
-                               return a == b;
-                       };
-
-                       HashFunc<string?> str_hash0 = (a) => {
-                               if (a == null) {
-                                       return 0;
-                               }
-
-                               return a.hash ();
-                       };
-
-                       deprecated = new HashMap<string?, ArrayList<Symbol>> (str_hash0, str_eq0);
+                       deprecated = new HashMap<string?, ArrayList<Symbol>> ();
                }
 
                ArrayList<Symbol> list = deprecated.get (version);

diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index f725ef7c3bc0eaf8bdaabc83caefb894af517330..8b9c13e9e658252d18b8cb69cdcab55108c63c66 100644 (file)
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -132,7 +132,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
                Run? sec = null;
 
                Iterator<Inline> iter = run.content.iterator ();
-               for (bool has_next = iter.first (); has_next; has_next = iter.next ()) {
+               for (bool has_next = iter.next (); has_next; has_next = iter.next ()) {
                        Inline item = iter.get ();
                        if (sec == null) {
                                Inline? tmp = split_inline (item);
@@ -163,7 +163,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
                Paragraph? sec = null;
 
                Iterator<Inline> iter = p.content.iterator ();
-               for (bool has_next = iter.first (); has_next; has_next = iter.next ()) {
+               for (bool has_next = iter.next (); has_next; has_next = iter.next ()) {
                        Inline item = iter.get ();
                        if (sec == null) {
                                Inline? tmp = split_inline (item);
@@ -262,7 +262,7 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
                }
 
                MapIterator<string, Api.SourceComment> iter = gir_comment.parameter_iterator ();
-               for (bool has_next = iter.first (); has_next; has_next = iter.next ()) {
+               for (bool has_next = iter.next (); has_next; has_next = iter.next ()) {
                        Taglets.Param? taglet = this.parse_block_taglet (iter.get_value (), "param") as Taglets.Param;
                        if (taglet == null) {
                                return null;

diff --git a/src/libvaladoc/markupreader.vala b/src/libvaladoc/markupreader.vala
index 1d63642bf03c5c2def0c216b6b1bb0ae7b1ca040..9752bf9904369e5420ffb74d2497d1e1765ecd81 100644 (file)
--- a/src/libvaladoc/markupreader.vala
+++ b/src/libvaladoc/markupreader.vala
@@ -54,7 +54,7 @@ public class Valadoc.MarkupReader : Object {
        private int line;
        private int column;
 
-       private Map<string, string> attributes = new HashMap<string, string> (str_hash, str_equal);
+       private Map<string, string> attributes = new HashMap<string, string> ();
        private bool empty_element;
 
        private ErrorReporter reporter;
@@ -109,7 +109,7 @@ public class Valadoc.MarkupReader : Object {
         * @return map of current attributes
         */
        public Map<string,string> get_attributes () {
-               var result = new HashMap<string,string> (str_hash, str_equal);
+               var result = new HashMap<string, string> ();
                foreach (var key in attributes.keys) {
                        result.set (key, attributes.get (key));
                }

diff --git a/src/libvaladoc/valadoc-1.0.deps.in b/src/libvaladoc/valadoc-1.0.deps.in
index 2e4a8477c6df743b1a164e6f2d0d9dd4fc55c4c9..485c5a5cea9aa3a02ad9e66b858ad70242b4f712 100644 (file)
--- a/src/libvaladoc/valadoc-1.0.deps.in
+++ b/src/libvaladoc/valadoc-1.0.deps.in
@@ -1,3 +1,3 @@
 libgvc
-gee-1.0
+gee-0.8
 gmodule-2.0

diff --git a/src/libvaladoc/valadoc-1.0.pc.in b/src/libvaladoc/valadoc-1.0.pc.in
index b16036f359dc8ae9b25dbd3bd61ff6397b7f3594..8cf9ab02e06d492d4cec44a5808b2dd18f856d83 100644 (file)
--- a/src/libvaladoc/valadoc-1.0.pc.in
+++ b/src/libvaladoc/valadoc-1.0.pc.in
@@ -9,6 +9,6 @@ vapidir=@datadir@/vala/vapi
 Name: Valadoc
 Description: The Vala documentation compiler library
 Version: @VERSION@
-Requires: libgvc gee-1.0 gmodule-2.0
+Requires: libgvc gee-0.8 gmodule-2.0
 Libs: -L${libdir} -lvaladoc
 Cflags: -I${includedir}/valadoc-1.0

diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index 156f8830d471e67a3e3927756a4d1d31ae525cc8..21013f5f96c177ba80c530f4eab2a67ee92645f0 100644 (file)
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -41,7 +41,7 @@ valadoc_LDADD =                 \
 
 
 valadoc.vala.stamp: $(valadoc_VALASOURCES)
-       $(VALAC) -C --pkg config --pkg gee-1.0 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
+       $(VALAC) -C --pkg config --pkg gee-0.8 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
        touch $@
 
 

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 8de474a06dc488d1c1ee229bc0079a4951c04c13..ae22e633a81530a583951564819564b9a9f74bb9 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -30,7 +30,7 @@ export G_DEBUG=fatal_warnings
 export PKG_CONFIG_PATH=../../src/libvaladoc
 
 VALAC=valac
-VALAFLAGS="-X -D -X TOP_SRC_DIR=\"$topsrcdir\" --vapidir $topsrcdir/src/libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --disable-warnings --main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -L$topsrcdir//src/libvaladoc/.libs -X -I$topsrcdir/src/libvaladoc $topsrcdir/tests/libvaladoc/parser/generic-scanner.vala $topsrcdir/tests/drivers/generic-api-test.vala"
+VALAFLAGS="-X -D -X TOP_SRC_DIR=\"$topsrcdir\" --vapidir $topsrcdir/src/libvaladoc --pkg valadoc-1.0 --pkg gee-0.8 --disable-warnings --main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -L$topsrcdir//src/libvaladoc/.libs -X -I$topsrcdir/src/libvaladoc $topsrcdir/tests/libvaladoc/parser/generic-scanner.vala $topsrcdir/tests/drivers/generic-api-test.vala"
 VAPIGEN=$topbuilddir/vapigen/vapigen
 VAPIGENFLAGS=