From: Florian Brosch Date: Wed, 10 Feb 2010 01:10:56 +0000 (+0100) Subject: libvaladoc: rm useless ? from container in check function X-Git-Tag: 0.37.1~3^2~490 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d43cb1836745dce93ae057341056bf0d0c662d51;p=thirdparty%2Fvala.git libvaladoc: rm useless ? from container in check function --- diff --git a/src/libvaladoc/content/blockcontent.vala b/src/libvaladoc/content/blockcontent.vala index d9d3e4bf4..c3c55fdff 100755 --- a/src/libvaladoc/content/blockcontent.vala +++ b/src/libvaladoc/content/blockcontent.vala @@ -34,7 +34,7 @@ public abstract class Valadoc.Content.BlockContent : ContentElement { public override void configure (Settings settings, ResourceLocator locator) { } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { foreach (Block element in _content) { element.check (api_root, container, reporter, settings); } diff --git a/src/libvaladoc/content/comment.vala b/src/libvaladoc/content/comment.vala index 0a49cc39f..6978b8f11 100755 --- a/src/libvaladoc/content/comment.vala +++ b/src/libvaladoc/content/comment.vala @@ -36,7 +36,7 @@ public class Valadoc.Content.Comment : BlockContent { public override void configure (Settings settings, ResourceLocator locator) { } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { base.check (api_root, container, reporter, settings); foreach (Taglet element in _taglets) { diff --git a/src/libvaladoc/content/contentelement.vala b/src/libvaladoc/content/contentelement.vala index 1cecf850d..8886ca89e 100755 --- a/src/libvaladoc/content/contentelement.vala +++ b/src/libvaladoc/content/contentelement.vala @@ -28,7 +28,7 @@ public abstract class Valadoc.Content.ContentElement : Object { public virtual void configure (Settings settings, ResourceLocator locator) { } - public abstract void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings); + public abstract void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings); public abstract void accept (ContentVisitor visitor); diff --git a/src/libvaladoc/content/embedded.vala b/src/libvaladoc/content/embedded.vala index fd040d31f..527e9ca8b 100755 --- a/src/libvaladoc/content/embedded.vala +++ b/src/libvaladoc/content/embedded.vala @@ -42,7 +42,7 @@ public class Valadoc.Content.Embedded : ContentElement, Inline, StyleAttributes _locator = locator; } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { if (!FileUtils.test (url, FileTest.EXISTS | FileTest.IS_REGULAR)) { reporter.simple_error ("%s does not exist".printf (url)); } else { diff --git a/src/libvaladoc/content/headline.vala b/src/libvaladoc/content/headline.vala index 60844dbcd..c644c71c4 100755 --- a/src/libvaladoc/content/headline.vala +++ b/src/libvaladoc/content/headline.vala @@ -31,7 +31,7 @@ public class Valadoc.Content.Headline : Block, InlineContent { _level = 0; } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // TODO report error if level == 0 ? // TODO: content.size == 0? diff --git a/src/libvaladoc/content/inlinecontent.vala b/src/libvaladoc/content/inlinecontent.vala index 687331419..cdb247036 100755 --- a/src/libvaladoc/content/inlinecontent.vala +++ b/src/libvaladoc/content/inlinecontent.vala @@ -35,7 +35,7 @@ public abstract class Valadoc.Content.InlineContent : ContentElement { internal InlineContent () { } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { foreach (Inline element in _content) { element.check (api_root, container, reporter, settings); } diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala index 32df022b9..b1efc40b7 100755 --- a/src/libvaladoc/content/inlinetaglet.vala +++ b/src/libvaladoc/content/inlinetaglet.vala @@ -50,7 +50,7 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl this.locator = locator; } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { ContentElement element = get_content (); element.check (api_root, container, reporter, settings); } diff --git a/src/libvaladoc/content/link.vala b/src/libvaladoc/content/link.vala index 21658e71f..421039aa0 100755 --- a/src/libvaladoc/content/link.vala +++ b/src/libvaladoc/content/link.vala @@ -33,7 +33,7 @@ public class Valadoc.Content.Link : InlineContent, Inline { public override void configure (Settings settings, ResourceLocator locator) { } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { //TODO: check url } diff --git a/src/libvaladoc/content/list.vala b/src/libvaladoc/content/list.vala index 9c6cb7faa..cf7f82aaf 100755 --- a/src/libvaladoc/content/list.vala +++ b/src/libvaladoc/content/list.vala @@ -108,7 +108,7 @@ public class Valadoc.Content.List : ContentElement, Block { _items = new ArrayList (); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check individual list items foreach (ListItem element in _items) { element.check (api_root, container, reporter, settings); diff --git a/src/libvaladoc/content/listitem.vala b/src/libvaladoc/content/listitem.vala index 56f13ddf5..f6907964e 100755 --- a/src/libvaladoc/content/listitem.vala +++ b/src/libvaladoc/content/listitem.vala @@ -30,7 +30,7 @@ public class Valadoc.Content.ListItem : InlineContent { base (); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check inline content base.check (api_root, container, reporter, settings); diff --git a/src/libvaladoc/content/paragraph.vala b/src/libvaladoc/content/paragraph.vala index 12bded1cb..8f89b48b3 100755 --- a/src/libvaladoc/content/paragraph.vala +++ b/src/libvaladoc/content/paragraph.vala @@ -32,7 +32,7 @@ public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes { base (); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check inline content base.check (api_root, container, reporter, settings); } diff --git a/src/libvaladoc/content/run.vala b/src/libvaladoc/content/run.vala index 17a6809c4..99d166e36 100755 --- a/src/libvaladoc/content/run.vala +++ b/src/libvaladoc/content/run.vala @@ -117,7 +117,7 @@ public class Valadoc.Content.Run : InlineContent, Inline { _style = style; } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check inline content base.check (api_root, container, reporter, settings); } diff --git a/src/libvaladoc/content/sourcecode.vala b/src/libvaladoc/content/sourcecode.vala index c10e7c461..13634b0df 100755 --- a/src/libvaladoc/content/sourcecode.vala +++ b/src/libvaladoc/content/sourcecode.vala @@ -64,7 +64,7 @@ public class Valadoc.Content.SourceCode : ContentElement, Inline{ _language = Language.VALA; } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { } public override void accept (ContentVisitor visitor) { diff --git a/src/libvaladoc/content/symbollink.vala b/src/libvaladoc/content/symbollink.vala index 5dd1d0913..11d4d330f 100755 --- a/src/libvaladoc/content/symbollink.vala +++ b/src/libvaladoc/content/symbollink.vala @@ -36,7 +36,7 @@ public class Valadoc.Content.SymbolLink : ContentElement, Inline { public override void configure (Settings settings, ResourceLocator locator) { } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { } public override void accept (ContentVisitor visitor) { diff --git a/src/libvaladoc/content/table.vala b/src/libvaladoc/content/table.vala index 45828fa8a..95feebe7a 100755 --- a/src/libvaladoc/content/table.vala +++ b/src/libvaladoc/content/table.vala @@ -33,7 +33,7 @@ public class Valadoc.Content.Table : ContentElement, Block { _rows = new ArrayList (); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check the table consistency in term of row/column number // Check individual rows diff --git a/src/libvaladoc/content/tablecell.vala b/src/libvaladoc/content/tablecell.vala index 1987520a7..dddd89f5e 100755 --- a/src/libvaladoc/content/tablecell.vala +++ b/src/libvaladoc/content/tablecell.vala @@ -36,7 +36,7 @@ public class Valadoc.Content.TableCell : InlineContent, StyleAttributes { _rowspan = 1; } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check inline content base.check (api_root, container, reporter, settings); } diff --git a/src/libvaladoc/content/tablerow.vala b/src/libvaladoc/content/tablerow.vala index a4835defb..b2868cc9d 100755 --- a/src/libvaladoc/content/tablerow.vala +++ b/src/libvaladoc/content/tablerow.vala @@ -33,7 +33,7 @@ public class Valadoc.Content.TableRow : ContentElement { _cells = new ArrayList (); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // Check individual cells foreach (var cell in _cells) { cell.check (api_root, container, reporter, settings); diff --git a/src/libvaladoc/content/text.vala b/src/libvaladoc/content/text.vala index 760969653..f4704e843 100755 --- a/src/libvaladoc/content/text.vala +++ b/src/libvaladoc/content/text.vala @@ -36,7 +36,7 @@ public class Valadoc.Content.Text : ContentElement, Inline { } } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { } public override void accept (ContentVisitor visitor) { diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala index cdbbdfb3f..22874c675 100755 --- a/src/libvaladoc/taglets/tagletdeprecated.vala +++ b/src/libvaladoc/taglets/tagletdeprecated.vala @@ -39,7 +39,7 @@ public class Valadoc.Taglets.Deprecated : InlineContent, Taglet, Block { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + 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 dd8ab9960..4583b1981 100755 --- a/src/libvaladoc/taglets/tagletinheritdoc.vala +++ b/src/libvaladoc/taglets/tagletinheritdoc.vala @@ -41,7 +41,7 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + 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 79005e4c7..cada6b3da 100755 --- a/src/libvaladoc/taglets/tagletlink.vala +++ b/src/libvaladoc/taglets/tagletlink.vala @@ -47,7 +47,7 @@ public class Valadoc.Taglets.Link : InlineTaglet { importer.end_element ("inline-taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + 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) { // TODO use ContentElement's source reference diff --git a/src/libvaladoc/taglets/tagletparam.vala b/src/libvaladoc/taglets/tagletparam.vala index 95719a768..f43b5815a 100755 --- a/src/libvaladoc/taglets/tagletparam.vala +++ b/src/libvaladoc/taglets/tagletparam.vala @@ -47,7 +47,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // TODO check for the existence of such a parameter base.check (api_root, container, reporter, settings); diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala index dbf8de67f..a40fe3247 100755 --- a/src/libvaladoc/taglets/tagletreturn.vala +++ b/src/libvaladoc/taglets/tagletreturn.vala @@ -40,7 +40,7 @@ public class Valadoc.Taglets.Return : InlineContent, Taglet, Block { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { // TODO check for the existence of a return type base.check (api_root, container, reporter, settings); diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala index 62b7a263c..430b83905 100755 --- a/src/libvaladoc/taglets/tagletsee.vala +++ b/src/libvaladoc/taglets/tagletsee.vala @@ -46,7 +46,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + 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) { // TODO use ContentElement's source reference diff --git a/src/libvaladoc/taglets/tagletsince.vala b/src/libvaladoc/taglets/tagletsince.vala index 62f9bd39e..220865c8f 100755 --- a/src/libvaladoc/taglets/tagletsince.vala +++ b/src/libvaladoc/taglets/tagletsince.vala @@ -45,7 +45,7 @@ public class Valadoc.Taglets.Since : ContentElement, Taglet, Block { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) { } public override void accept (ContentVisitor visitor) { diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala index 85cec296a..02be9abfd 100755 --- a/src/libvaladoc/taglets/tagletthrows.vala +++ b/src/libvaladoc/taglets/tagletthrows.vala @@ -47,7 +47,7 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block { importer.end_element ("taglet"); } - public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter, Settings settings) { + 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) { // TODO use ContentElement's source reference