[valadoc] Fix build against Vala master

[Florian Brosch <flobrosch src gnome org>]

commit 908e9e280ce49a2c95bdef8aa82b91e571517b03
Author: Didier "Ptitjes <ptitjes free fr>
Date:   Tue Oct 20 14:01:38 2009 +0200

    Fix build against Vala master

 src/libvaladoc/api/tree.vala |   11 +---
 src/libvaladoc/settings.vala |    3 +-
 src/valadoc/valadoc          |  136 ------------------------------------------
 src/valadoc/valadoc.vala     |    7 +-
 4 files changed, 7 insertions(+), 150 deletions(-)
---
diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala
index 868f110..a8b492c 100644
--- a/src/libvaladoc/api/tree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -114,7 +114,7 @@ public class Valadoc.Api.Tree {
 		this.context.checking = settings.enable_checking;
 		this.context.deprecated = settings.deprecated;
 		this.context.experimental = settings.experimental;
-//		this.context.non_null_experimental = settings.non_null_experimental;
+		this.context.experimental_non_null = settings.experimental || settings.experimental_non_null;
 		this.context.dbus_transformation = !settings.disable_dbus_transformation;
 
 
@@ -292,15 +292,6 @@ public class Valadoc.Api.Tree {
 			return false;
 		}
 
-//		if (context.non_null_experimental) {
-//			Vala.NullChecker null_checker = new Vala.NullChecker ();
-//			null_checker.check (this.context);
-
-//			if (this.context.report.get_errors () > 0) {
-//				return false;
-//			}
-//		}
-
 		Api.NodeBuilder builder = new NodeBuilder (this);
 		this.context.accept(builder);
 		this.resolve_type_references ();
diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala
index 7870ab5..8785f88 100755
--- a/src/libvaladoc/settings.vala
+++ b/src/libvaladoc/settings.vala
@@ -33,7 +33,7 @@ public class Valadoc.Settings : Object {
 	public bool enable_checking;
 	public bool deprecated;
 	public bool experimental;
-	public bool non_null_experimental;
+	public bool experimental_non_null;
 	public bool disable_dbus_transformation;
 
 	public string? profile;
@@ -44,3 +44,4 @@ public class Valadoc.Settings : Object {
 	public string[] vapi_directories;
 }
 
+
diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index 0cd6055..86332c2 100755
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -46,7 +46,7 @@ public class ValaDoc : Object {
 	private static bool enable_checking;
 	private static bool deprecated;
 	private static bool experimental;
-	private static bool non_null_experimental = false;
+	private static bool experimental_non_null = false;
 	private static bool disable_dbus_transformation;
 	private static string profile;
 
@@ -63,7 +63,7 @@ public class ValaDoc : Object {
 		{ "enable-checking", 0, 0, OptionArg.NONE, ref enable_checking, "Enable additional run-time checks", null },
 		{ "enable-deprecated", 0, 0, OptionArg.NONE, ref deprecated, "Enable deprecated features", null },
 		{ "enable-experimental", 0, 0, OptionArg.NONE, ref experimental, "Enable experimental features", null },
-		{ "enable-non-null-experimental", 0, 0, OptionArg.NONE, ref non_null_experimental, "Enable experimental enhancements for non-null types", null },
+		{ "enable-experimental-non-null", 0, 0, OptionArg.NONE, ref experimental_non_null, "Enable experimental enhancements for non-null types", null },
 		{ "disable-dbus-transformation", 0, 0, OptionArg.NONE, ref disable_dbus_transformation, "Disable transformation of D-Bus member names", null },
 		{ "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, ref vapi_directories, "Look for package bindings in DIRECTORY", "DIRECTORY..." },
 		{ "profile", 0, 0, OptionArg.STRING, ref profile, "Use the given profile instead of the default", "PROFILE" },
@@ -141,7 +141,7 @@ public class ValaDoc : Object {
 		settings.enable_checking = enable_checking;
 		settings.deprecated = deprecated;
 		settings.experimental = experimental;
-		settings.non_null_experimental = non_null_experimental;
+		settings.experimental_non_null = experimental_non_null;
 		settings.disable_dbus_transformation = disable_dbus_transformation;
 		settings.basedir = basedir;
 		settings.directory = directory;
@@ -294,3 +294,4 @@ public class ValaDoc : Object {
 	}
 }
 
+