From: Florian Brosch Date: Wed, 1 Sep 2010 05:32:10 +0000 (+0200) Subject: libvaladoc: Fix valac warnings X-Git-Tag: 0.37.1~3^2~426 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c4e38d337209df7536e420a16cadf8862ddf92d;p=thirdparty%2Fvala.git libvaladoc: Fix valac warnings --- diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala index 5d07446f7..2bcb5a971 100644 --- a/src/libvaladoc/api/tree.vala +++ b/src/libvaladoc/api/tree.vala @@ -396,10 +396,10 @@ public class Valadoc.Api.Tree { } private void process_wiki (DocumentationParser docparser) { - this.wikitree = new WikiPageTree(this.reporter, this.settings); + this.wikitree = new WikiPageTree(reporter, settings); var pkg = get_source_package (); if (pkg != null) { - wikitree.create_tree (docparser, pkg); + wikitree.create_tree (docparser, pkg, reporter); } } diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala index 82dd65891..071c67924 100644 --- a/src/libvaladoc/documentation/documentationparser.vala +++ b/src/libvaladoc/documentation/documentationparser.vala @@ -1105,10 +1105,12 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator { _wiki_parser.set_root_rule (page); } +#if DEBUG private void dump_stack () { message ("Dumping stack"); foreach (Object object in _stack) { message ("%s", object.get_type ().name ()); } } +#endif } diff --git a/src/libvaladoc/documentation/wiki.vala b/src/libvaladoc/documentation/wiki.vala index ed20fe04c..33f77adda 100755 --- a/src/libvaladoc/documentation/wiki.vala +++ b/src/libvaladoc/documentation/wiki.vala @@ -62,13 +62,13 @@ public class Valadoc.WikiPage : Object, Documentation { this.path = path; } - public void read () throws GLib.FileError { + public void read (ErrorReporter reporter) { try { string content; FileUtils.get_contents (this.path, out content); this.documentation_str = content; } catch (FileError err) { - throw err; + reporter.simple_error ("Unable to read file `%s': %s".printf (this.path, err.message)); } } @@ -107,36 +107,36 @@ public class Valadoc.WikiPageTree : Object { return null; } - private void create_tree_from_path (DocumentationParser docparser, Api.Package package, string path, string? nameoffset = null) throws GLib.FileError { - Dir dir = Dir.open (path); - - for (string? curname = dir.read_name (); curname!=null ; curname = dir.read_name ()) { - string filename = Path.build_filename (path, curname); - if (curname.has_suffix (".valadoc") && FileUtils.test (filename, FileTest.IS_REGULAR)) { - WikiPage wikipage = new WikiPage ((nameoffset!=null)? Path.build_filename (nameoffset, curname) : curname, filename, package); - this.wikipages.add(wikipage); - wikipage.read (); - } else if (FileUtils.test (filename, FileTest.IS_DIR)) { - this.create_tree_from_path (docparser, package, filename, (nameoffset!=null)? Path.build_filename (nameoffset, curname) : curname); + private void create_tree_from_path (DocumentationParser docparser, Api.Package package, ErrorReporter reporer, string path, string? nameoffset = null) { + try { + Dir dir = Dir.open (path); + + for (string? curname = dir.read_name (); curname!=null ; curname = dir.read_name ()) { + string filename = Path.build_filename (path, curname); + if (curname.has_suffix (".valadoc") && FileUtils.test (filename, FileTest.IS_REGULAR)) { + WikiPage wikipage = new WikiPage ((nameoffset!=null)? Path.build_filename (nameoffset, curname) : curname, filename, package); + this.wikipages.add(wikipage); + wikipage.read (reporter); + } else if (FileUtils.test (filename, FileTest.IS_DIR)) { + this.create_tree_from_path (docparser, package, reporter, filename, (nameoffset!=null)? Path.build_filename (nameoffset, curname) : curname); + } } + } catch (FileError err) { + reporter.simple_error ("Unable to open directory `%s': %s".printf (path, err.message)); } } - public void create_tree (DocumentationParser docparser, Api.Package package) throws GLib.FileError { - try { - weak string path = this.settings.wiki_directory; - if (path == null) { - return ; - } + public void create_tree (DocumentationParser docparser, Api.Package package, ErrorReporter reporer) { + weak string path = this.settings.wiki_directory; + if (path == null) { + return; + } - this.wikipages = new ArrayList (); - this.create_tree_from_path (docparser, package, path); + this.wikipages = new ArrayList (); + this.create_tree_from_path (docparser, package, reporter, path); - foreach (WikiPage page in this.wikipages) { - page.parse (docparser, package); - } - } catch (FileError err) { - throw err; + foreach (WikiPage page in this.wikipages) { + page.parse (docparser, package); } } } diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala index f9fc82a4d..a88703529 100755 --- a/src/libvaladoc/html/basicdoclet.vala +++ b/src/libvaladoc/html/basicdoclet.vala @@ -512,7 +512,6 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { } public void write_symbol_content (Api.Node node) { - string full_name = node.get_full_name (); writer.start_tag ("div", {"class", css_style_content}); writer.start_tag ("h1", {"class", css_title}).text (node.name).end_tag ("h1"); writer.simple_tag ("hr", {"class", css_headline_hr}); diff --git a/src/libvaladoc/importer/valadocdocumentationimporter.vala b/src/libvaladoc/importer/valadocdocumentationimporter.vala index e895c941e..7c6b23710 100644 --- a/src/libvaladoc/importer/valadocdocumentationimporter.vala +++ b/src/libvaladoc/importer/valadocdocumentationimporter.vala @@ -134,10 +134,6 @@ public class Valadoc.Importer.ValadocDocumentationImporter : DocumentationImport } catch (ParserError err) { } } - - public string resolve (string path) { - return path; - } } diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala index 205194882..8743aecb0 100755 --- a/src/libvaladoc/moduleloader.vala +++ b/src/libvaladoc/moduleloader.vala @@ -35,6 +35,10 @@ public class Valadoc.ModuleLoader : TypeModule { private Module docletmodule; private Type doclettype; + public ModuleLoader () { + Object (); + } + public override bool load () { return true; }