GNOME.org
 

[valadoc] gee-0.8

commit 8a670906e9e04b883afeca949a6791fa02dc9058
Author: Florian Brosch <flo brosch gmail com>
Date:   Tue Nov 27 18:23:39 2012 +0100

    gee-0.8

 configure.ac                                       |    4 +-
 src/doclets/devhelp/Makefile.am                    |    2 +-
 src/doclets/gtkdoc/Makefile.am                     |    2 +-
 src/doclets/gtkdoc/gcomment.vala                   |    6 ++--
 src/doclets/htm/Makefile.am                        |    2 +-
 src/driver/0.10.x/Makefile.am                      |    2 +-
 src/driver/0.12.x/Makefile.am                      |    2 +-
 src/driver/0.14.x/Makefile.am                      |    2 +-
 src/driver/0.16.x/Makefile.am                      |    2 +-
 src/driver/0.18.x/Makefile.am                      |    2 +-
 src/libvaladoc/Makefile.am                         |    2 +-
 src/libvaladoc/api/node.vala                       |    8 +++---
 src/libvaladoc/api/package.vala                    |   22 +-------------------
 .../documentation/gtkdoccommentparser.vala         |    6 ++--
 src/libvaladoc/markupreader.vala                   |    4 +-
 src/libvaladoc/valadoc-1.0.deps.in                 |    2 +-
 src/libvaladoc/valadoc-1.0.pc.in                   |    2 +-
 src/valadoc/Makefile.am                            |    2 +-
 tests/testrunner.sh                                |    2 +-
 19 files changed, 28 insertions(+), 48 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5260732..a8fc554 100644
--- 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 8cbd650..e7c2446 100644
--- 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 b0ba3e0..66dcc55 100644
--- 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 4e683ca..ae86792 100644
--- 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 75161b8..5f3be83 100644
--- 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 9c285fd..25e7289 100644
--- 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 1c99d1d..00447b3 100644
--- 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 2e4fe6c..07c4c95 100644
--- 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 b390213..c33cc9f 100644
--- 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 ad64d18..d626a7f 100644
--- 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 def3017..5b81e1f 100644
--- 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 c97d366..9b2cee7 100644
--- 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 85be9bd..8c2cad1 100644
--- 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 f725ef7..8b9c13e 100644
--- 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 1d63642..9752bf9 100644
--- 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 2e4a847..485c5a5 100644
--- 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 b16036f..8cf9ab0 100644
--- 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 156f883..21013f5 100644
--- 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 8de474a..ae22e63 100755
--- 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=
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]