[valadoc] libvaladoc: rm support for valadoc-xml



commit 2516cd489ffe3b3f10045a534a1f697aabedc5b9
Author: Florian Brosch <flo brosch gmail com>
Date:   Sat Aug 7 04:00:12 2010 +0200

    libvaladoc: rm support for valadoc-xml

 src/libvaladoc/Makefile.am                         |    2 -
 src/libvaladoc/content/inlinetaglet.vala           |    2 -
 src/libvaladoc/content/taglet.vala                 |    2 -
 .../importer/valadocdocumentationimporter.vala     |  674 --------------------
 src/libvaladoc/importer/valamarkupreader.vala      |  269 --------
 src/libvaladoc/taglets/tagletdeprecated.vala       |   11 -
 src/libvaladoc/taglets/tagletinheritdoc.vala       |   11 -
 src/libvaladoc/taglets/tagletlink.vala             |   12 -
 src/libvaladoc/taglets/tagletparam.vala            |   11 -
 src/libvaladoc/taglets/tagletreturn.vala           |   11 -
 src/libvaladoc/taglets/tagletsee.vala              |   12 -
 src/libvaladoc/taglets/tagletsince.vala            |   12 -
 src/libvaladoc/taglets/tagletthrows.vala           |   12 -
 src/valadoc/valadoc.vala                           |    6 -
 14 files changed, 0 insertions(+), 1047 deletions(-)
---
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 4b26657..0633ae1 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -36,8 +36,6 @@ libvaladoc_la_VALASOURCES = \
 	documentation/wiki.vala \
 	documentation/wikiscanner.vala \
 	importer/documentationimporter.vala \
-	importer/valadocdocumentationimporter.vala \
-	importer/valamarkupreader.vala \
 	api/array.vala \
 	api/class.vala \
 	api/constant.vala \
diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala
index b1efc40..1ea92bb 100755
--- a/src/libvaladoc/content/inlinetaglet.vala
+++ b/src/libvaladoc/content/inlinetaglet.vala
@@ -34,8 +34,6 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl
 
 	public abstract Rule? get_parser_rule (Rule run_rule);
 
-	public abstract void xml_importer_parer_rule (Xml.DocumentationImporter importer);
-
 	public abstract ContentElement produce_content ();
 
 	private ContentElement get_content () {
diff --git a/src/libvaladoc/content/taglet.vala b/src/libvaladoc/content/taglet.vala
index b8b1f15..503cb7c 100755
--- a/src/libvaladoc/content/taglet.vala
+++ b/src/libvaladoc/content/taglet.vala
@@ -25,8 +25,6 @@ using Gee;
 
 public interface Valadoc.Content.Taglet : ContentElement {
 
-	public abstract void xml_importer_parer_rule (Xml.DocumentationImporter importer);
-
 	public abstract Rule? get_parser_rule (Rule run_rule);
 }
 
diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala
index 22874c6..4386571 100755
--- a/src/libvaladoc/taglets/tagletdeprecated.vala
+++ b/src/libvaladoc/taglets/tagletdeprecated.vala
@@ -28,17 +28,6 @@ public class Valadoc.Taglets.Deprecated : InlineContent, Taglet, Block {
 		return run_rule;
 	}
 
-	public void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		base.check (api_root, container, reporter, settings);
 	}
diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala
index 4583b19..dbba7e5 100755
--- a/src/libvaladoc/taglets/tagletinheritdoc.vala
+++ b/src/libvaladoc/taglets/tagletinheritdoc.vala
@@ -30,17 +30,6 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet {
 		return null;
 	}
 
-	public override void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		// TODO Check that the container is an override of an abstract symbol
 		// Also retrieve that abstract symbol _inherited
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index cada6b3..a25976d 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -35,18 +35,6 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 		});
 	}
 
-	public override void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("inline-taglet");
-		symbol_name = importer.reader.get_attribute ("type");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("inline-taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		_symbol = api_root.search_symbol_str (container, symbol_name);
 		if (_symbol == null) {
diff --git a/src/libvaladoc/taglets/tagletparam.vala b/src/libvaladoc/taglets/tagletparam.vala
index f43b581..a4f1694 100755
--- a/src/libvaladoc/taglets/tagletparam.vala
+++ b/src/libvaladoc/taglets/tagletparam.vala
@@ -35,17 +35,6 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
 		});
 	}
 
-	public void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		parameter_name = importer.reader.get_attribute ("parameter");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
 
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		// TODO check for the existence of such a parameter
diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala
index a40fe32..a4beee0 100755
--- a/src/libvaladoc/taglets/tagletreturn.vala
+++ b/src/libvaladoc/taglets/tagletreturn.vala
@@ -29,17 +29,6 @@ public class Valadoc.Taglets.Return : InlineContent, Taglet, Block {
 		return run_rule;
 	}
 
-	public void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		// TODO check for the existence of a return type
 
diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index 430b839..6610d98 100755
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -34,18 +34,6 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
 		});
 	}
 
-	public void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		symbol_name = importer.reader.get_attribute ("type");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		symbol = api_root.search_symbol_str (container, symbol_name);
 		if (symbol == null) {
diff --git a/src/libvaladoc/taglets/tagletsince.vala b/src/libvaladoc/taglets/tagletsince.vala
index 220865c..f3acab7 100755
--- a/src/libvaladoc/taglets/tagletsince.vala
+++ b/src/libvaladoc/taglets/tagletsince.vala
@@ -33,18 +33,6 @@ public class Valadoc.Taglets.Since : ContentElement, Taglet, Block {
 		});
 	}
 
-	public void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		version = importer.reader.get_attribute ("version");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 	}
 
diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index 02be9ab..25b6525 100755
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -35,18 +35,6 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
 		});
 	}
 
-	public void xml_importer_parer_rule (Xml.DocumentationImporter importer) {
-		importer.start_element ("taglet");
-		error_domain_name = importer.reader.get_attribute ("type");
-		importer.push (this);
-		importer.next ();
-
-		importer.process_text ();
-
-		importer.pop ();
-		importer.end_element ("taglet");
-	}
-
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		error_domain = api_root.search_symbol_str (container, error_domain_name);
 		if (error_domain == null) {
diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index a0be66b..2bdeb5c 100755
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -191,7 +191,6 @@ public class ValaDoc : Object {
 
 		Valadoc.Api.Tree doctree = new Valadoc.Api.Tree (reporter, settings);
 		Valadoc.DocumentationParser docparser = new Valadoc.DocumentationParser (settings, reporter, doctree, modules);
-		Valadoc.DocumentationImporter importer = new Valadoc.Xml.DocumentationImporter (doctree, modules, settings, reporter);
 
 		doctree.add_depencies (packages);
 		if (reporter.errors > 0) {
@@ -212,11 +211,6 @@ public class ValaDoc : Object {
 			return quit (reporter);
 		}
 
-		doctree.import_documentation (importer);
-		if (reporter.errors > 0) {
-			return quit (reporter);
-		}
-
 		modules.doclet.process (settings, doctree);
 		return quit (reporter);
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]