[valadoc] Api: Move all classes to the Valadoc.Api namespace
- From: Florian Brosch <flobrosch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [valadoc] Api: Move all classes to the Valadoc.Api namespace
- Date: Sat, 17 Oct 2009 00:16:47 +0000 (UTC)
commit ed0375712e790eda355f022221032abbd747f023
Author: Didier 'Ptitjes <ptitjes free fr>
Date: Fri Oct 16 20:46:55 2009 +0200
Api: Move all classes to the Valadoc.Api namespace
src/doclets/devhelp/doclet/Makefile.am | 2 +-
src/doclets/devhelp/doclet/doclet.vala | 13 +++----
src/doclets/htm/doclet/Makefile.am | 2 +-
src/doclets/htm/doclet/doclet.vala | 11 +++---
src/doclets/htmlhelpers/doclet/Makefile.am | 2 +-
src/doclets/htmlhelpers/doclet/doclet.vala | 38 ++++++++++----------
src/doclets/htmlhelpers/doclet/globals.vala | 14 +++----
src/libvaladoc/apitree/apiitem.vala | 4 +-
src/libvaladoc/apitree/apimembernode.vala | 8 ++---
src/libvaladoc/apitree/apinode.vala | 18 +++++-----
src/libvaladoc/apitree/apinodebuilder.vala | 2 +-
src/libvaladoc/apitree/apisymbolnode.vala | 6 ++--
src/libvaladoc/apitree/apitree.vala | 26 ++++++-------
src/libvaladoc/apitree/apitypesymbolnode.vala | 6 ++--
src/libvaladoc/apitree/array.vala | 10 +++---
src/libvaladoc/apitree/class.vala | 16 ++++----
src/libvaladoc/apitree/classhandler.vala | 8 ++--
src/libvaladoc/apitree/constant.vala | 10 +++---
src/libvaladoc/apitree/constanthandler.vala | 8 ++--
.../apitree/constructionmethodhandler.vala | 8 ++--
src/libvaladoc/apitree/delegate.vala | 20 +++++-----
src/libvaladoc/apitree/delegatehandler.vala | 8 ++--
src/libvaladoc/apitree/enum.vala | 14 ++++----
src/libvaladoc/apitree/enumhandler.vala | 8 ++--
src/libvaladoc/apitree/enumvalue.vala | 10 +++---
src/libvaladoc/apitree/errorcode.vala | 10 +++---
src/libvaladoc/apitree/errordomain.vala | 14 ++++----
src/libvaladoc/apitree/errordomainhandler.vala | 8 ++--
src/libvaladoc/apitree/exceptionlisthandler.vala | 6 ++--
src/libvaladoc/apitree/field.vala | 10 +++---
src/libvaladoc/apitree/fieldhandler.vala | 8 ++--
src/libvaladoc/apitree/formalparameter.vala | 10 +++---
src/libvaladoc/apitree/interface.vala | 16 ++++----
src/libvaladoc/apitree/interfacehandler.vala | 8 ++--
src/libvaladoc/apitree/method.vala | 28 +++++++-------
src/libvaladoc/apitree/methodhandler.vala | 8 ++--
src/libvaladoc/apitree/namespace.vala | 8 ++--
src/libvaladoc/apitree/namespacehandler.vala | 8 ++--
src/libvaladoc/apitree/package.vala | 8 ++--
src/libvaladoc/apitree/parameterlisthandler.vala | 6 ++--
src/libvaladoc/apitree/pointer.vala | 10 +++---
src/libvaladoc/apitree/property.vala | 10 +++---
src/libvaladoc/apitree/propertyaccessor.vala | 8 ++--
src/libvaladoc/apitree/propertyhandler.vala | 8 ++--
src/libvaladoc/apitree/returntypehandler.vala | 4 +-
src/libvaladoc/apitree/signal.vala | 12 +++---
src/libvaladoc/apitree/signalhandler.vala | 8 ++--
src/libvaladoc/apitree/signaturebuilder.vala | 2 +-
src/libvaladoc/apitree/struct.vala | 14 ++++----
src/libvaladoc/apitree/structhandler.vala | 8 ++--
src/libvaladoc/apitree/symbolaccessibility.vala | 4 +-
.../apitree/templateparameterlisthandler.vala | 6 ++--
src/libvaladoc/apitree/typeparameter.vala | 10 +++---
src/libvaladoc/apitree/typereference.vala | 16 ++++----
src/libvaladoc/apitree/visitable.vala | 4 +-
src/libvaladoc/content/blockcontent.vala | 2 +-
src/libvaladoc/content/comment.vala | 2 +-
src/libvaladoc/content/contentelement.vala | 2 +-
src/libvaladoc/content/embedded.vala | 2 +-
src/libvaladoc/content/headline.vala | 2 +-
src/libvaladoc/content/inlinecontent.vala | 2 +-
src/libvaladoc/content/inlinetaglet.vala | 2 +-
src/libvaladoc/content/link.vala | 2 +-
src/libvaladoc/content/list.vala | 2 +-
src/libvaladoc/content/listitem.vala | 2 +-
src/libvaladoc/content/paragraph.vala | 2 +-
src/libvaladoc/content/run.vala | 2 +-
src/libvaladoc/content/sourcecode.vala | 2 +-
src/libvaladoc/content/symbollink.vala | 2 +-
src/libvaladoc/content/table.vala | 2 +-
src/libvaladoc/content/tablecell.vala | 2 +-
src/libvaladoc/content/tablerow.vala | 2 +-
src/libvaladoc/content/text.vala | 2 +-
src/libvaladoc/doclet.vala | 38 +++++++++----------
.../documentation/documentationparser.vala | 4 +-
src/libvaladoc/drawer.vala | 2 +-
src/libvaladoc/taglets/tagletdeprecated.vala | 2 +-
src/libvaladoc/taglets/tagletinheritdoc.vala | 11 +++---
src/libvaladoc/taglets/tagletlink.vala | 2 +-
src/libvaladoc/taglets/tagletparam.vala | 2 +-
src/libvaladoc/taglets/tagletreturn.vala | 2 +-
src/libvaladoc/taglets/tagletsee.vala | 2 +-
src/libvaladoc/taglets/tagletsince.vala | 2 +-
src/libvaladoc/taglets/tagletthrows.vala | 3 +-
src/valadoc/valadoc.vala | 2 +-
85 files changed, 324 insertions(+), 336 deletions(-)
---
diff --git a/src/doclets/devhelp/doclet/Makefile.am b/src/doclets/devhelp/doclet/Makefile.am
index 7d4841b..d287899 100644
--- a/src/doclets/devhelp/doclet/Makefile.am
+++ b/src/doclets/devhelp/doclet/Makefile.am
@@ -37,7 +37,7 @@ libdoclet_la_SOURCES = \
libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
- $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --vapidir . --pkg docletconfig --basedir . $^
+ $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --vapidir ../../../libvaladoc --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --vapidir . --pkg docletconfig --basedir . $^
touch $@
diff --git a/src/doclets/devhelp/doclet/doclet.vala b/src/doclets/devhelp/doclet/doclet.vala
index 5708b90..bb198ed 100755
--- a/src/doclets/devhelp/doclet/doclet.vala
+++ b/src/doclets/devhelp/doclet/doclet.vala
@@ -19,11 +19,10 @@
using Valadoc;
-using GLib;
+using Valadoc.Api;
using Xml;
using Gee;
-
namespace Valadoc.Devhelp {
public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) {
if ( element is Visitable ) {
@@ -202,7 +201,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
private const string css_path = "wikistyle.css";
private string package_dir_name = ""; // remove
private DevhelpFormat devhelp;
- private Tree tree;
+ private Api.Tree tree;
private string get_path ( Api.Node element ) {
return element.full_name () + ".html";
@@ -212,7 +211,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
return GLib.Path.build_filename ( this.settings.path, this.package_dir_name, element.full_name () + ".html" );
}
- public override void initialisation ( Settings settings, Tree tree ) {
+ public override void initialisation ( Settings settings, Api.Tree tree ) {
this.settings = settings;
this.tree = tree;
@@ -451,7 +450,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
public override void visit_error_code ( ErrorCode errcode ) {
}
- public override void visit_enum_value ( EnumValue enval ) {
+ public override void visit_enum_value ( Api.EnumValue enval ) {
}
public override void visit_delegate ( Delegate del ) {
@@ -468,7 +467,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
file = null;
}
- public override void visit_signal ( Signal sig ) {
+ public override void visit_signal ( Api.Signal sig ) {
string rpath = this.get_real_path ( sig );
string path = this.get_path ( sig );
@@ -482,7 +481,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
file = null;
}
- public override void visit_method ( Method m, Valadoc.MethodHandler parent ) {
+ public override void visit_method ( Method m, Api.MethodHandler parent ) {
string rpath = this.get_real_path ( m );
string path = this.get_path ( m );
diff --git a/src/doclets/htm/doclet/Makefile.am b/src/doclets/htm/doclet/Makefile.am
index ffe8a83..9817f50 100644
--- a/src/doclets/htm/doclet/Makefile.am
+++ b/src/doclets/htm/doclet/Makefile.am
@@ -39,7 +39,7 @@ libdoclet_la_SOURCES = \
libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
- $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --pkg valadoc-1.0 --pkg gee-1.0 --vapidir . --pkg docletconfig --basedir . $^
+ $(VALAC) -C --vapidir ../../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../../vapi --vapidir ../../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --vapidir . --pkg docletconfig --basedir . $^
touch $@
diff --git a/src/doclets/htm/doclet/doclet.vala b/src/doclets/htm/doclet/doclet.vala
index b3a003f..5ddcb66 100755
--- a/src/doclets/htm/doclet/doclet.vala
+++ b/src/doclets/htm/doclet/doclet.vala
@@ -19,10 +19,9 @@
using Valadoc;
-using GLib;
+using Valadoc.Api;
using Gee;
-
namespace Valadoc {
public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) {
if ( element is Visitable ) {
@@ -109,7 +108,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
return GLib.Path.build_filename ( this.settings.path, element.package.name, element.full_name () + ".html" );
}
- public override void initialisation ( Settings settings, Tree tree ) {
+ public override void initialisation ( Settings settings, Api.Tree tree ) {
this.settings = settings;
DirUtils.create ( this.settings.path, 0777 );
@@ -294,7 +293,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
public override void visit_error_code ( ErrorCode errcode ) {
}
- public override void visit_enum_value ( EnumValue enval ) {
+ public override void visit_enum_value ( Api.EnumValue enval ) {
}
public override void visit_delegate ( Delegate del ) {
@@ -308,7 +307,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
file = null;
}
- public override void visit_signal ( Signal sig ) {
+ public override void visit_signal ( Api.Signal sig ) {
string rpath = this.get_real_path ( sig );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
@@ -319,7 +318,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
file = null;
}
- public override void visit_method ( Method m, Valadoc.MethodHandler parent ) {
+ public override void visit_method ( Method m, Api.MethodHandler parent ) {
string rpath = this.get_real_path ( m );
GLib.FileStream file = GLib.FileStream.open ( rpath, "w");
diff --git a/src/doclets/htmlhelpers/doclet/Makefile.am b/src/doclets/htmlhelpers/doclet/Makefile.am
index 7eda7ea..e1a1fdd 100644
--- a/src/doclets/htmlhelpers/doclet/Makefile.am
+++ b/src/doclets/htmlhelpers/doclet/Makefile.am
@@ -44,7 +44,7 @@ libhtmlhelpersincludedir = $(includedir)/vala-1.0
libhtmlhelpers.vala.stamp: $(libhtmlhelpers_la_VALASOURCES)
- $(VALAC) -C -H libhtmlhelpers-1.0.h --library libhtmlhelpers-1.0 --basedir . --vapidir ../../../vapi --pkg valadoc-1.0 --pkg gee-1.0 --save-temps $^
+ $(VALAC) -C -H libhtmlhelpers-1.0.h --library libhtmlhelpers-1.0 --basedir . --vapidir ../../../vapi --vapidir ../../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --save-temps $^
touch $@
diff --git a/src/doclets/htmlhelpers/doclet/doclet.vala b/src/doclets/htmlhelpers/doclet/doclet.vala
index caf3ebc..c66ab4f 100755
--- a/src/doclets/htmlhelpers/doclet/doclet.vala
+++ b/src/doclets/htmlhelpers/doclet/doclet.vala
@@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
using GLib;
using Valadoc.Content;
+using Valadoc.Api;
public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
protected Settings settings;
@@ -68,7 +68,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
this.write_navi_entry_html_template ( file, style, name );
}
- protected void write_wiki_pages (Tree tree, string css_path_wiki, string contentp) {
+ protected void write_wiki_pages (Api.Tree tree, string css_path_wiki, string contentp) {
if ( tree.wikitree == null ) {
return ;
}
@@ -266,10 +266,10 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_enum_inline ( GLib.FileStream file, Enum en, Api.Node? mself ) {
- Gee.Collection<EnumValue> enum_values = en.get_enum_values ( );
+ Gee.Collection<Api.EnumValue> enum_values = en.get_enum_values ( );
file.printf ( "<ul class=\"%s\">\n", css_navi );
- foreach ( EnumValue env in enum_values ) {
+ foreach ( Api.EnumValue env in enum_values ) {
this.write_navi_entry ( file, env, en, css_navi_enval, true );
}
@@ -377,7 +377,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_signal ( GLib.FileStream file, Signal sig ) {
+ protected void write_navi_signal ( GLib.FileStream file, Api.Signal sig ) {
Api.Node parent = (Api.Node)sig.parent;
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
@@ -527,10 +527,10 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
this.write_navi_child_construction_methods_collection ( file, methods, mself );
}
- protected void write_navi_child_signals ( GLib.FileStream file, SignalHandler sh, Api.Node? mself ) {
- Gee.Collection<Signal> signals = sh.get_signal_list ( );
+ protected void write_navi_child_signals ( GLib.FileStream file, Api.SignalHandler sh, Api.Node? mself ) {
+ Gee.Collection<Api.Signal> signals = sh.get_signal_list ( );
- foreach ( Signal sig in signals ) {
+ foreach ( Api.Signal sig in signals ) {
if ( sig == mself )
this.write_navi_entry ( file, sig, mself, css_navi_sig, false );
else
@@ -720,7 +720,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
_renderer.render (element.signature);
}
- public void write_navi_packages_inline ( GLib.FileStream file, Tree tree ) {
+ public void write_navi_packages_inline ( GLib.FileStream file, Api.Tree tree ) {
file.printf ( "<ul class=\"%s\">\n", css_navi );
foreach ( Package pkg in tree.get_package_list() ) {
if (pkg.is_visitor_accessible (settings)) {
@@ -735,13 +735,13 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</li>\n" );
}
- public void write_navi_packages ( GLib.FileStream file, Tree tree ) {
+ public void write_navi_packages ( GLib.FileStream file, Api.Tree tree ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_navi_packages_inline ( file, tree );
file.puts ( "\t\t\t</div>\n" );
}
- public void write_packages_content ( GLib.FileStream file, Tree tree ) {
+ public void write_packages_content ( GLib.FileStream file, Api.Tree tree ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">Packages:</h1>\n", css_title );
file.printf ( "\t\t\t\t<hr class=\"%s\" />\n", css_headline_hr );
@@ -759,7 +759,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- public void write_method_content ( GLib.FileStream file, Method m , Valadoc.MethodHandler parent ) {
+ public void write_method_content ( GLib.FileStream file, Method m , Api.MethodHandler parent ) {
string full_name = m.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -801,7 +801,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- public void write_signal_content ( GLib.FileStream file, Signal sig ) {
+ public void write_signal_content ( GLib.FileStream file, Api.Signal sig ) {
string full_name = sig.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -923,11 +923,11 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
private void write_child_enum_values ( GLib.FileStream file, Enum en ) {
- Gee.Collection<EnumValue> enum_values = en.get_enum_values ();
+ Gee.Collection<Api.EnumValue> enum_values = en.get_enum_values ();
if ( enum_values.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Enum Values:</h3>\n", css_title );
file.printf ( "<table class=\"%s\">\n", css_enum_table );
- foreach ( EnumValue enval in enum_values ) {
+ foreach ( Api.EnumValue enval in enum_values ) {
file.puts ( "<tr>\n" );
file.printf ( "\t<td class=\"%s\" id=\"%s\">%s</td>\n", css_enum_table_name, enval.name, enval.name );
file.printf ( "\t<td class=\"%s\">\n", css_enum_table_text );
@@ -1266,12 +1266,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_signals ( GLib.FileStream file, SignalHandler sh, Api.Node? mself ) {
- Gee.Collection<Signal> signals = sh.get_signal_list ();
+ protected void write_child_signals ( GLib.FileStream file, Api.SignalHandler sh, Api.Node? mself ) {
+ Gee.Collection<Api.Signal> signals = sh.get_signal_list ();
if ( signals.size > 0 ) {
- file.printf ( "<h3 class=\"%s\">Signals:</h3>\n", css_title );
+ file.printf ( "<h3 class=\"%s\">Api.Signals:</h3>\n", css_title );
file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
- foreach ( Signal sig in signals ) {
+ foreach ( Api.Signal sig in signals ) {
file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a>", get_html_inline_navigation_link_css_class (sig), css_navi_link, this.get_link(sig, mself), sig.name );
this.write_brief_description ( file, sig, mself );
file.printf ( "</li>\n" );
diff --git a/src/doclets/htmlhelpers/doclet/globals.vala b/src/doclets/htmlhelpers/doclet/globals.vala
index edb7cf2..c455acd 100755
--- a/src/doclets/htmlhelpers/doclet/globals.vala
+++ b/src/doclets/htmlhelpers/doclet/globals.vala
@@ -17,9 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-using GLib;
-
+using Valadoc.Api;
namespace Valadoc.Html {
public const string css_inline_navigation = "main_inline_navigation";
@@ -154,7 +152,7 @@ namespace Valadoc.Html {
prefix = "../" + ((Api.Node)element).package.name;
}
- if ( element is Valadoc.EnumValue || element is Valadoc.ErrorCode ) {
+ if ( element is Api.EnumValue || element is Api.ErrorCode ) {
tmp = "#" + ((Api.Node)element).name;
element = (Api.Node)((Api.Node)element).parent;
}
@@ -199,7 +197,7 @@ namespace Valadoc.Html {
else
return css_content_link_method;
}
- else if ( element is Signal ) {
+ else if ( element is Api.Signal ) {
return css_content_link_signal;
}
else if ( element is Property ) {
@@ -216,7 +214,7 @@ namespace Valadoc.Html {
else if ( element is Constant ) {
return css_content_link_constant;
}
- else if ( element is EnumValue ) {
+ else if ( element is Api.EnumValue ) {
return css_content_link_enumvalue;
}
else if ( element is ErrorCode ) {
@@ -261,7 +259,7 @@ namespace Valadoc.Html {
else
return css_inline_navigation_method;
}
- else if ( element is Signal ) {
+ else if ( element is Api.Signal ) {
return css_inline_navigation_signal;
}
else if ( element is Property ) {
@@ -278,7 +276,7 @@ namespace Valadoc.Html {
else if ( element is Constant ) {
return css_inline_navigation_constant;
}
- else if ( element is EnumValue ) {
+ else if ( element is Api.EnumValue ) {
return css_inline_navigation_enumvalue;
}
else if ( element is ErrorCode ) {
diff --git a/src/libvaladoc/apitree/apiitem.vala b/src/libvaladoc/apitree/apiitem.vala
index 1d94811..fa78d31 100644
--- a/src/libvaladoc/apitree/apiitem.vala
+++ b/src/libvaladoc/apitree/apiitem.vala
@@ -1,6 +1,6 @@
/* apiitem.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ using Gee;
public abstract class Valadoc.Api.Item : Object {
private Inline _signature;
- public Api.Item parent {
+ public Item parent {
protected set;
get;
}
diff --git a/src/libvaladoc/apitree/apimembernode.vala b/src/libvaladoc/apitree/apimembernode.vala
index 7e7aed2..91a5170 100644
--- a/src/libvaladoc/apitree/apimembernode.vala
+++ b/src/libvaladoc/apitree/apimembernode.vala
@@ -1,6 +1,6 @@
/* apitypesymbolnode.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
*
* This program is free software; you can redistribute it and/or
@@ -23,10 +23,9 @@
using Gee;
+public abstract class Valadoc.Api.MemberNode : SymbolNode {
-public abstract class Valadoc.Api.MemberNode : Api.SymbolNode {
-
- public MemberNode (Vala.Member symbol, Api.Node parent) {
+ public MemberNode (Vala.Member symbol, Node parent) {
base (symbol, parent);
}
@@ -39,4 +38,3 @@ public abstract class Valadoc.Api.MemberNode : Api.SymbolNode {
base.process_comments (settings, parser);
}
}
-
diff --git a/src/libvaladoc/apitree/apinode.vala b/src/libvaladoc/apitree/apinode.vala
index 8a42a4c..af3cbf6 100644
--- a/src/libvaladoc/apitree/apinode.vala
+++ b/src/libvaladoc/apitree/apinode.vala
@@ -1,6 +1,6 @@
/* apinode.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
*
* This program is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@ public enum Valadoc.Api.NodeType {
TYPE_PARAMETER
}
-public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation {
+public abstract class Valadoc.Api.Node : Item, Visitable, Documentation {
private bool do_document = false;
public abstract string? name { owned get; }
@@ -57,7 +57,7 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation {
private Map<Vala.Symbol, Node> per_symbol_children;
private Map<NodeType?, Gee.List<Node>> per_type_children;
- public Node (Api.Node? parent) {
+ public Node (Node? parent) {
this.parent = parent;
per_name_children = new HashMap<string,Node> ();
@@ -157,12 +157,12 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation {
get {
if (this._nspace == null) {
Api.Item ast = this;
- while (ast is Valadoc.Namespace == false) {
+ while (ast is Valadoc.Api.Namespace == false) {
ast = ast.parent;
if (ast == null)
return null;
}
- this._nspace = (Valadoc.Namespace)ast;
+ this._nspace = (Valadoc.Api.Namespace)ast;
}
return this._nspace;
}
@@ -173,12 +173,12 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation {
get {
if (this._package == null) {
Api.Item ast = this;
- while (ast is Valadoc.Package == false) {
+ while (ast is Valadoc.Api.Package == false) {
ast = ast.parent;
if (ast == null)
return null;
}
- this._package = (Valadoc.Package)ast;
+ this._package = (Valadoc.Api.Package)ast;
}
return this._package;
}
@@ -198,8 +198,8 @@ public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation {
GLib.StringBuilder full_name = new GLib.StringBuilder (this.name);
if (this.parent != null) {
- for (Api.Item pos = this.parent; pos is Package == false ; pos = pos.parent) {
- string name = ((Api.Node)pos).name;
+ for (Item pos = this.parent; pos is Package == false ; pos = pos.parent) {
+ string name = ((Node)pos).name;
if (name != null) {
full_name.prepend_unichar ('.');
full_name.prepend (name);
diff --git a/src/libvaladoc/apitree/apinodebuilder.vala b/src/libvaladoc/apitree/apinodebuilder.vala
index 87b0bcf..a950d11 100644
--- a/src/libvaladoc/apitree/apinodebuilder.vala
+++ b/src/libvaladoc/apitree/apinodebuilder.vala
@@ -1,6 +1,6 @@
/* apinodebuilder.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
*
* This program is free software; you can redistribute it and/or
diff --git a/src/libvaladoc/apitree/apisymbolnode.vala b/src/libvaladoc/apitree/apisymbolnode.vala
index 959560e..3db9ca5 100644
--- a/src/libvaladoc/apitree/apisymbolnode.vala
+++ b/src/libvaladoc/apitree/apisymbolnode.vala
@@ -1,6 +1,6 @@
/* apisymbolnode.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
*
* This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
using Gee;
-public abstract class Valadoc.Api.SymbolNode : Api.Node, SymbolAccessibility {
+public abstract class Valadoc.Api.SymbolNode : Node, SymbolAccessibility {
protected Vala.Symbol symbol { private set; get; }
// TODO Drop DocumentedElement
@@ -36,7 +36,7 @@ public abstract class Valadoc.Api.SymbolNode : Api.Node, SymbolAccessibility {
}
}
- public SymbolNode (Vala.Symbol symbol, Api.Node parent) {
+ public SymbolNode (Vala.Symbol symbol, Node parent) {
base (parent);
this.symbol = symbol;
}
diff --git a/src/libvaladoc/apitree/apitree.vala b/src/libvaladoc/apitree/apitree.vala
index 246eb12..b398c08 100644
--- a/src/libvaladoc/apitree/apitree.vala
+++ b/src/libvaladoc/apitree/apitree.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -19,15 +19,13 @@
using Gee;
-
// private
-public Valadoc.Class glib_error = null;
-
+public Valadoc.Api.Class glib_error = null;
-public class Valadoc.Tree {
+public class Valadoc.Api.Tree {
private ArrayList<Package> packages = new ArrayList<Package>();
private Package source_package = null;
- private Valadoc.Settings settings;
+ private Settings settings;
private Vala.CodeContext context;
private ErrorReporter reporter;
private Package sourcefiles = null;
@@ -57,7 +55,7 @@ public class Valadoc.Tree {
doclet.initialisation (this.settings, this);
}
- private Api.Node? search_relative_to (Api.Node element, string[] path) {
+ private Node? search_relative_to (Node element, string[] path) {
Api.Node? node = element;
foreach (string name in path) {
node = node.find_by_name (name);
@@ -67,13 +65,13 @@ public class Valadoc.Tree {
}
if (node == null && element.parent != null) {
- node = search_relative_to ((Api.Node) element.parent, path);
+ node = search_relative_to ((Node) element.parent, path);
}
return node;
}
- public Api.Node? search_symbol_str (Api.Node? element, string symname) {
+ public Node? search_symbol_str (Node? element, string symname) {
string[] path = split_name (symname);
if (element == null) {
@@ -81,13 +79,13 @@ public class Valadoc.Tree {
foreach (Package packgage in packages) {
node = search_relative_to (packgage, path);
if (node != null) {
- return (Api.Node) node;
+ return (Node) node;
}
}
return null;
}
- return (Api.Node) search_relative_to ((Api.Node) element, path);
+ return (Node) search_relative_to ((Node) element, path);
}
private string[] split_name (string full_name) {
@@ -97,7 +95,7 @@ public class Valadoc.Tree {
return params;
}
- public Tree (Valadoc.ErrorReporter reporter, Valadoc.Settings settings) {
+ public Tree (ErrorReporter reporter, Settings settings) {
this.context = new Vala.CodeContext ( );
Vala.CodeContext.push (context);
@@ -296,7 +294,7 @@ public class Valadoc.Tree {
}
}
- Api.NodeBuilder builder = new Api.NodeBuilder (this);
+ Api.NodeBuilder builder = new NodeBuilder (this);
this.context.accept(builder);
this.resolve_type_references ();
this.add_dependencies_to_source_package ();
@@ -330,7 +328,7 @@ public class Valadoc.Tree {
}
}
- internal Api.Node? search_vala_symbol (Vala.Symbol? vnode) {
+ internal Node? search_vala_symbol (Vala.Symbol? vnode) {
if (vnode == null) {
return null;
}
diff --git a/src/libvaladoc/apitree/apitypesymbolnode.vala b/src/libvaladoc/apitree/apitypesymbolnode.vala
index df9a38a..e21ebd2 100644
--- a/src/libvaladoc/apitree/apitypesymbolnode.vala
+++ b/src/libvaladoc/apitree/apitypesymbolnode.vala
@@ -1,6 +1,6 @@
/* apitypesymbolnode.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
*
* This program is free software; you can redistribute it and/or
@@ -24,9 +24,9 @@
using Gee;
-public abstract class Valadoc.Api.TypeSymbolNode : Api.SymbolNode {
+public abstract class Valadoc.Api.TypeSymbolNode : SymbolNode {
- public TypeSymbolNode (Vala.TypeSymbol symbol, Api.Node parent) {
+ public TypeSymbolNode (Vala.TypeSymbol symbol, Node parent) {
base (symbol, parent);
}
diff --git a/src/libvaladoc/apitree/array.vala b/src/libvaladoc/apitree/array.vala
index e0799dc..69fe1fe 100644
--- a/src/libvaladoc/apitree/array.vala
+++ b/src/libvaladoc/apitree/array.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,15 +20,15 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Array : Api.Item {
+public class Valadoc.Api.Array : Item {
private Vala.ArrayType vtype;
- public Api.Item data_type {
+ public Item data_type {
private set;
get;
}
- public Array (Vala.ArrayType vtyperef, Api.Item parent) {
+ public Array (Vala.ArrayType vtyperef, Item parent) {
this.vtype = vtyperef;
this.parent = parent;
@@ -53,7 +53,7 @@ public class Valadoc.Array : Api.Item {
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_content (data_type.signature)
.append ("[]", false)
.get ();
diff --git a/src/libvaladoc/apitree/class.vala b/src/libvaladoc/apitree/class.vala
index 3ce4a62..fe30777 100644
--- a/src/libvaladoc/apitree/class.vala
+++ b/src/libvaladoc/apitree/class.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,11 +20,11 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, SignalHandler, MethodHandler, EnumHandler, PropertyHandler, ConstructionMethodHandler, FieldHandler, DelegateHandler, ConstantHandler, TemplateParameterListHandler {
+public class Valadoc.Api.Class : TypeSymbolNode, ClassHandler, StructHandler, SignalHandler, MethodHandler, EnumHandler, PropertyHandler, ConstructionMethodHandler, FieldHandler, DelegateHandler, ConstantHandler, TemplateParameterListHandler {
private ArrayList<TypeReference> interfaces;
private Vala.Class vclass;
- public Class (Vala.Class symbol, Api.Node parent) {
+ public Class (Vala.Class symbol, Node parent) {
base (symbol, parent);
this.interfaces = new ArrayList<TypeReference> ();
@@ -64,7 +64,7 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si
doclet.visit_class ( this );
}
- public override Api.NodeType node_type { get { return Api.NodeType.CLASS; } }
+ public override NodeType node_type { get { return NodeType.CLASS; } }
public override void accept (Doclet doclet) {
visit (doclet);
@@ -95,7 +95,7 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
if (is_abstract) {
@@ -104,11 +104,11 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si
signature.append_keyword ("class");
signature.append_symbol (this);
- var type_parameters = get_children_by_type (Api.NodeType.TYPE_PARAMETER, false);
+ var type_parameters = get_children_by_type (NodeType.TYPE_PARAMETER, false);
if (type_parameters.size > 0) {
signature.append ("<", false);
bool first = true;
- foreach (Api.Item param in type_parameters) {
+ foreach (Item param in type_parameters) {
if (!first) {
signature.append (",", false);
}
@@ -131,7 +131,7 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si
signature.append (":");
}
- foreach (Api.Item implemented_interface in interfaces) {
+ foreach (Item implemented_interface in interfaces) {
if (!first) {
signature.append (",", false);
}
diff --git a/src/libvaladoc/apitree/classhandler.vala b/src/libvaladoc/apitree/classhandler.vala
index 3aff418..065d112 100644
--- a/src/libvaladoc/apitree/classhandler.vala
+++ b/src/libvaladoc/apitree/classhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
-public interface Valadoc.ClassHandler : Api.Node {
+public interface Valadoc.Api.ClassHandler : Node {
protected Class? find_vclass (Vala.Class vcl) {
foreach (Class cl in get_class_list ()) {
if (cl.is_vclass (vcl)) {
@@ -36,11 +36,11 @@ public interface Valadoc.ClassHandler : Api.Node {
}
public Gee.Collection<Class> get_class_list () {
- return get_children_by_type (Api.NodeType.CLASS);
+ return get_children_by_type (NodeType.CLASS);
}
public void visit_classes (Doclet doclet) {
- accept_children_by_type (Api.NodeType.CLASS, doclet);
+ accept_children_by_type (NodeType.CLASS, doclet);
}
}
diff --git a/src/libvaladoc/apitree/constant.vala b/src/libvaladoc/apitree/constant.vala
index 4332e36..e3accae 100644
--- a/src/libvaladoc/apitree/constant.vala
+++ b/src/libvaladoc/apitree/constant.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler {
+public class Valadoc.Api.Constant : MemberNode, ReturnTypeHandler {
private Vala.Constant vconst;
public TypeReference? type_reference {
@@ -32,7 +32,7 @@ public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler {
return (this.vconst == vconst);
}
- public Constant (Vala.Constant symbol, Api.Node parent) {
+ public Constant (Vala.Constant symbol, Node parent) {
base (symbol, parent);
this.vconst = symbol;
@@ -49,7 +49,7 @@ public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler {
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_keyword (get_accessibility_modifier ())
.append_keyword ("const")
.append_content (type_reference.signature)
@@ -61,7 +61,7 @@ public class Valadoc.Constant : Api.MemberNode, ReturnTypeHandler {
doclet.visit_constant (this, parent);
}
- public override Api.NodeType node_type { get { return Api.NodeType.CONSTANT; } }
+ public override NodeType node_type { get { return NodeType.CONSTANT; } }
public override void accept (Doclet doclet) {
visit (doclet, (ConstantHandler)parent);
diff --git a/src/libvaladoc/apitree/constanthandler.vala b/src/libvaladoc/apitree/constanthandler.vala
index a00579a..ab44e89 100644
--- a/src/libvaladoc/apitree/constanthandler.vala
+++ b/src/libvaladoc/apitree/constanthandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@
using Gee;
-public interface Valadoc.ConstantHandler : Api.Node {
+public interface Valadoc.Api.ConstantHandler : Node {
public Collection<Constant> get_constant_list () {
- return get_children_by_type (Api.NodeType.CONSTANT);
+ return get_children_by_type (NodeType.CONSTANT);
}
public void visit_constants (Doclet doclet) {
- accept_children_by_type (Api.NodeType.CONSTANT, doclet);
+ accept_children_by_type (NodeType.CONSTANT, doclet);
}
}
diff --git a/src/libvaladoc/apitree/constructionmethodhandler.vala b/src/libvaladoc/apitree/constructionmethodhandler.vala
index 223c87d..46d96ea 100644
--- a/src/libvaladoc/apitree/constructionmethodhandler.vala
+++ b/src/libvaladoc/apitree/constructionmethodhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,13 +20,13 @@
using Gee;
-public interface Valadoc.ConstructionMethodHandler : Api.Node {
+public interface Valadoc.Api.ConstructionMethodHandler : Node {
public Collection<Method> get_construction_method_list () {
- return get_children_by_type (Api.NodeType.CREATION_METHOD);
+ return get_children_by_type (NodeType.CREATION_METHOD);
}
public void visit_construction_methods ( Doclet doclet ) {
- accept_children_by_type (Api.NodeType.CREATION_METHOD, doclet);
+ accept_children_by_type (NodeType.CREATION_METHOD, doclet);
}
}
diff --git a/src/libvaladoc/apitree/delegate.vala b/src/libvaladoc/apitree/delegate.vala
index 5b5c529..641aad8 100644
--- a/src/libvaladoc/apitree/delegate.vala
+++ b/src/libvaladoc/apitree/delegate.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, ReturnTypeHandler, TemplateParameterListHandler, ExceptionHandler {
+public class Valadoc.Api.Delegate : TypeSymbolNode, ParameterListHandler, ReturnTypeHandler, TemplateParameterListHandler, ExceptionHandler {
private Vala.Delegate vdelegate;
- public Delegate (Vala.Delegate symbol, Api.Node parent) {
+ public Delegate (Vala.Delegate symbol, Node parent) {
base (symbol, parent);
this.vdelegate = symbol;
@@ -45,7 +45,7 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return
doclet.visit_delegate (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.DELEGATE; } }
+ public override NodeType node_type { get { return NodeType.DELEGATE; } }
public override void accept (Doclet doclet) {
visit (doclet);
@@ -67,7 +67,7 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
if (is_static) {
@@ -77,11 +77,11 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return
signature.append_content (type_reference.signature);
signature.append_symbol (this);
- var type_parameters = get_children_by_type (Api.NodeType.TYPE_PARAMETER);
+ var type_parameters = get_children_by_type (NodeType.TYPE_PARAMETER);
if (type_parameters.size > 0) {
signature.append ("<", false);
bool first = true;
- foreach (Api.Item param in type_parameters) {
+ foreach (Item param in type_parameters) {
if (!first) {
signature.append (",", false);
}
@@ -94,7 +94,7 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return
signature.append ("(");
bool first = true;
- foreach (Api.Node param in get_children_by_type (Api.NodeType.FORMAL_PARAMETER)) {
+ foreach (Node param in get_children_by_type (NodeType.FORMAL_PARAMETER)) {
if (!first) {
signature.append (",", false);
}
@@ -104,11 +104,11 @@ public class Valadoc.Delegate : Api.TypeSymbolNode, ParameterListHandler, Return
signature.append (")", false);
- var exceptions = get_children_by_type (Api.NodeType.ERROR_DOMAIN);
+ var exceptions = get_children_by_type (NodeType.ERROR_DOMAIN);
if (exceptions.size > 0) {
signature.append_keyword ("throws");
- foreach (Api.Node param in exceptions) {
+ foreach (Node param in exceptions) {
if (!first) {
signature.append (",", false);
}
diff --git a/src/libvaladoc/apitree/delegatehandler.vala b/src/libvaladoc/apitree/delegatehandler.vala
index 1a5c774..f93c377 100644
--- a/src/libvaladoc/apitree/delegatehandler.vala
+++ b/src/libvaladoc/apitree/delegatehandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,13 +20,13 @@
using Gee;
-public interface Valadoc.DelegateHandler : Api.Node {
+public interface Valadoc.Api.DelegateHandler : Node {
public Gee.Collection<Delegate> get_delegate_list () {
- return get_children_by_type (Api.NodeType.DELEGATE);
+ return get_children_by_type (NodeType.DELEGATE);
}
public void visit_delegates (Doclet doclet) {
- accept_children_by_type (Api.NodeType.DELEGATE, doclet);
+ accept_children_by_type (NodeType.DELEGATE, doclet);
}
}
diff --git a/src/libvaladoc/apitree/enum.vala b/src/libvaladoc/apitree/enum.vala
index 86fd629..dd44f3b 100644
--- a/src/libvaladoc/apitree/enum.vala
+++ b/src/libvaladoc/apitree/enum.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,8 +20,8 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Enum : Api.TypeSymbolNode, MethodHandler {
- public Enum (Vala.Enum symbol, Api.Node parent) {
+public class Valadoc.Api.Enum : TypeSymbolNode, MethodHandler {
+ public Enum (Vala.Enum symbol, Node parent) {
base (symbol, parent);
this.venum = symbol;
}
@@ -32,18 +32,18 @@ public class Valadoc.Enum : Api.TypeSymbolNode, MethodHandler {
// rename: get_enum_value_list
public Collection<EnumValue> get_enum_values () {
- return get_children_by_type (Api.NodeType.ENUM_VALUE);
+ return get_children_by_type (NodeType.ENUM_VALUE);
}
public void visit_enum_values (Doclet doclet) {
- accept_children_by_type (Api.NodeType.ENUM_VALUE, doclet);
+ accept_children_by_type (NodeType.ENUM_VALUE, doclet);
}
public void visit (Doclet doclet) {
doclet.visit_enum (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.ENUM; } }
+ public override NodeType node_type { get { return NodeType.ENUM; } }
public override void accept (Doclet doclet) {
visit (doclet);
@@ -52,7 +52,7 @@ public class Valadoc.Enum : Api.TypeSymbolNode, MethodHandler {
private Vala.Enum venum;
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_keyword (get_accessibility_modifier ())
.append_keyword ("enum")
.append_symbol (this)
diff --git a/src/libvaladoc/apitree/enumhandler.vala b/src/libvaladoc/apitree/enumhandler.vala
index 65ba3bc..a62a4aa 100644
--- a/src/libvaladoc/apitree/enumhandler.vala
+++ b/src/libvaladoc/apitree/enumhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,13 +20,13 @@
using Gee;
-public interface Valadoc.EnumHandler : Api.Node {
+public interface Valadoc.Api.EnumHandler : Node {
public Collection<Enum> get_enum_list () {
- return get_children_by_type (Api.NodeType.ENUM);
+ return get_children_by_type (NodeType.ENUM);
}
public void visit_enums (Doclet doclet) {
- accept_children_by_type (Api.NodeType.ENUM, doclet);
+ accept_children_by_type (NodeType.ENUM, doclet);
}
}
diff --git a/src/libvaladoc/apitree/enumvalue.vala b/src/libvaladoc/apitree/enumvalue.vala
index 5d40eee..c3860b8 100644
--- a/src/libvaladoc/apitree/enumvalue.vala
+++ b/src/libvaladoc/apitree/enumvalue.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.EnumValue: Api.SymbolNode {
+public class Valadoc.Api.EnumValue: SymbolNode {
private Vala.EnumValue venval;
- public EnumValue (Vala.EnumValue symbol, Api.Node parent) {
+ public EnumValue (Vala.EnumValue symbol, Node parent) {
base (symbol, parent);
this.venval = symbol;
}
@@ -49,14 +49,14 @@ public class Valadoc.EnumValue: Api.SymbolNode {
doclet.visit_enum_value (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.ENUM_VALUE; } }
+ public override NodeType node_type { get { return NodeType.ENUM_VALUE; } }
public override void accept (Doclet doclet) {
visit (doclet);
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_symbol (this)
.append ("=")
.append (this.venval.value.to_string ())
diff --git a/src/libvaladoc/apitree/errorcode.vala b/src/libvaladoc/apitree/errorcode.vala
index 63a701a..443cda3 100644
--- a/src/libvaladoc/apitree/errorcode.vala
+++ b/src/libvaladoc/apitree/errorcode.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.ErrorCode : Api.TypeSymbolNode {
+public class Valadoc.Api.ErrorCode : TypeSymbolNode {
private Vala.ErrorCode verrcode;
- public ErrorCode (Vala.ErrorCode symbol, Api.Node parent) {
+ public ErrorCode (Vala.ErrorCode symbol, Node parent) {
base (symbol, parent);
this.verrcode = symbol;
}
@@ -40,14 +40,14 @@ public class Valadoc.ErrorCode : Api.TypeSymbolNode {
doclet.visit_error_code (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.ERROR_CODE; } }
+ public override NodeType node_type { get { return NodeType.ERROR_CODE; } }
public override void accept (Doclet doclet) {
visit (doclet);
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_symbol (this)
.get ();
}
diff --git a/src/libvaladoc/apitree/errordomain.vala b/src/libvaladoc/apitree/errordomain.vala
index 8af7891..cfcde52 100644
--- a/src/libvaladoc/apitree/errordomain.vala
+++ b/src/libvaladoc/apitree/errordomain.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -21,10 +21,10 @@ using Gee;
using Valadoc.Content;
-public class Valadoc.ErrorDomain : Api.TypeSymbolNode, MethodHandler {
+public class Valadoc.Api.ErrorDomain : TypeSymbolNode, MethodHandler {
private Vala.ErrorDomain verrdom;
- public ErrorDomain (Vala.ErrorDomain symbol, Api.Node parent) {
+ public ErrorDomain (Vala.ErrorDomain symbol, Node parent) {
base (symbol, parent);
this.verrdom = symbol;
}
@@ -34,25 +34,25 @@ public class Valadoc.ErrorDomain : Api.TypeSymbolNode, MethodHandler {
}
public void visit_error_codes (Doclet doclet) {
- accept_children_by_type (Api.NodeType.ERROR_CODE, doclet);
+ accept_children_by_type (NodeType.ERROR_CODE, doclet);
}
public Collection<ErrorCode> get_error_code_list () {
- return get_children_by_type (Api.NodeType.ERROR_CODE);
+ return get_children_by_type (NodeType.ERROR_CODE);
}
public void visit (Doclet doclet) {
doclet.visit_error_domain (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.ERROR_DOMAIN; } }
+ public override NodeType node_type { get { return NodeType.ERROR_DOMAIN; } }
public override void accept (Doclet doclet) {
visit (doclet);
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_keyword (get_accessibility_modifier ())
.append_keyword ("errordomain")
.append_symbol (this)
diff --git a/src/libvaladoc/apitree/errordomainhandler.vala b/src/libvaladoc/apitree/errordomainhandler.vala
index 39ed449..d1cff91 100644
--- a/src/libvaladoc/apitree/errordomainhandler.vala
+++ b/src/libvaladoc/apitree/errordomainhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@
using Gee;
-public interface Valadoc.ErrorDomainHandler : Api.Node {
+public interface Valadoc.Api.ErrorDomainHandler : Node {
public Collection<ErrorDomain> get_error_domain_list () {
- return get_children_by_type (Api.NodeType.ERROR_DOMAIN);
+ return get_children_by_type (NodeType.ERROR_DOMAIN);
}
public void visit_error_domains (Doclet doclet) {
- accept_children_by_type (Api.NodeType.ERROR_DOMAIN, doclet);
+ accept_children_by_type (NodeType.ERROR_DOMAIN, doclet);
}
}
diff --git a/src/libvaladoc/apitree/exceptionlisthandler.vala b/src/libvaladoc/apitree/exceptionlisthandler.vala
index bb02a10..9f24bd9 100644
--- a/src/libvaladoc/apitree/exceptionlisthandler.vala
+++ b/src/libvaladoc/apitree/exceptionlisthandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -21,10 +21,10 @@ using Gee;
// rename to ExceptionListHandler
-public interface Valadoc.ExceptionHandler : Api.Node {
+public interface Valadoc.Api.ExceptionHandler : Node {
public Collection<Api.Node> get_error_domains () {
- return get_children_by_type (Api.NodeType.ERROR_DOMAIN);
+ return get_children_by_type (NodeType.ERROR_DOMAIN);
}
public void add_exception_list (Tree root, Vala.Collection<Vala.DataType> vexceptions) {
diff --git a/src/libvaladoc/apitree/field.vala b/src/libvaladoc/apitree/field.vala
index a1443b8..3b25b64 100644
--- a/src/libvaladoc/apitree/field.vala
+++ b/src/libvaladoc/apitree/field.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler {
+public class Valadoc.Api.Field : MemberNode, ReturnTypeHandler {
private Vala.Field vfield;
- public Field (Vala.Field symbol, Api.Node parent) {
+ public Field (Vala.Field symbol, Node parent) {
base (symbol, parent);
this.vfield = symbol;
@@ -63,7 +63,7 @@ public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler {
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
if (is_static) {
@@ -82,7 +82,7 @@ public class Valadoc.Field : Api.MemberNode, ReturnTypeHandler {
doclet.visit_field (this, parent);
}
- public override Api.NodeType node_type { get { return Api.NodeType.FIELD; } }
+ public override NodeType node_type { get { return NodeType.FIELD; } }
public override void accept (Doclet doclet) {
visit (doclet, (FieldHandler) parent);
diff --git a/src/libvaladoc/apitree/fieldhandler.vala b/src/libvaladoc/apitree/fieldhandler.vala
index 669c891..c599566 100644
--- a/src/libvaladoc/apitree/fieldhandler.vala
+++ b/src/libvaladoc/apitree/fieldhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@
using Gee;
-public interface Valadoc.FieldHandler : Api.Node {
+public interface Valadoc.Api.FieldHandler : Node {
public Collection<Field> get_field_list () {
- return get_children_by_type (Api.NodeType.FIELD);
+ return get_children_by_type (NodeType.FIELD);
}
public void visit_fields (Doclet doclet) {
- accept_children_by_type (Api.NodeType.FIELD, doclet);
+ accept_children_by_type (NodeType.FIELD, doclet);
}
}
diff --git a/src/libvaladoc/apitree/formalparameter.vala b/src/libvaladoc/apitree/formalparameter.vala
index 130dab4..f9aca98 100644
--- a/src/libvaladoc/apitree/formalparameter.vala
+++ b/src/libvaladoc/apitree/formalparameter.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.FormalParameter : Api.SymbolNode, ReturnTypeHandler {
+public class Valadoc.Api.FormalParameter : SymbolNode, ReturnTypeHandler {
private Vala.FormalParameter vformalparam;
- public FormalParameter (Vala.FormalParameter symbol, Api.Node parent) {
+ public FormalParameter (Vala.FormalParameter symbol, Node parent) {
base (symbol, parent);
this.vformalparam = symbol;
@@ -60,7 +60,7 @@ public class Valadoc.FormalParameter : Api.SymbolNode, ReturnTypeHandler {
}
}
- public override Api.NodeType node_type { get { return Api.NodeType.FORMAL_PARAMETER; } }
+ public override NodeType node_type { get { return NodeType.FORMAL_PARAMETER; } }
public override void accept (Doclet doclet) {
}
@@ -76,7 +76,7 @@ public class Valadoc.FormalParameter : Api.SymbolNode, ReturnTypeHandler {
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
if (ellipsis) {
signature.append ("...");
diff --git a/src/libvaladoc/apitree/interface.vala b/src/libvaladoc/apitree/interface.vala
index bfe5fc8..e43b4c9 100644
--- a/src/libvaladoc/apitree/interface.vala
+++ b/src/libvaladoc/apitree/interface.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,8 +20,8 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler, MethodHandler, DelegateHandler, EnumHandler, StructHandler, ClassHandler {
- public Interface (Vala.Interface symbol, Api.Node parent) {
+public class Valadoc.Api.Interface : TypeSymbolNode, SignalHandler, PropertyHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler, MethodHandler, DelegateHandler, EnumHandler, StructHandler, ClassHandler {
+ public Interface (Vala.Interface symbol, Node parent) {
base (symbol, parent);
this.vinterface = symbol;
}
@@ -47,7 +47,7 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand
doclet.visit_interface (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.INTERFACE; } }
+ public override NodeType node_type { get { return NodeType.INTERFACE; } }
public override void accept (Doclet doclet) {
visit (doclet);
@@ -78,17 +78,17 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
signature.append_keyword ("interface");
signature.append_symbol (this);
- var type_parameters = get_children_by_type (Api.NodeType.TYPE_PARAMETER, false);
+ var type_parameters = get_children_by_type (NodeType.TYPE_PARAMETER, false);
if (type_parameters.size > 0) {
signature.append ("<", false);
bool first = true;
- foreach (Api.Item param in type_parameters) {
+ foreach (Item param in type_parameters) {
if (!first) {
signature.append (",", false);
}
@@ -111,7 +111,7 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand
signature.append (":");
}
- foreach (Api.Item implemented_interface in interfaces) {
+ foreach (Item implemented_interface in interfaces) {
if (!first) {
signature.append (",", false);
}
diff --git a/src/libvaladoc/apitree/interfacehandler.vala b/src/libvaladoc/apitree/interfacehandler.vala
index 0f13e9a..695e782 100644
--- a/src/libvaladoc/apitree/interfacehandler.vala
+++ b/src/libvaladoc/apitree/interfacehandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@
using Gee;
-public interface Valadoc.InterfaceHandler : Api.Node {
+public interface Valadoc.Api.InterfaceHandler : Node {
public Collection<Interface> get_interface_list () {
- return get_children_by_type (Api.NodeType.INTERFACE);
+ return get_children_by_type (NodeType.INTERFACE);
}
public void visit_interfaces (Doclet doclet) {
- accept_children_by_type (Api.NodeType.INTERFACE, doclet);
+ accept_children_by_type (NodeType.INTERFACE, doclet);
}
}
diff --git a/src/libvaladoc/apitree/method.vala b/src/libvaladoc/apitree/method.vala
index d902315..61be9a1 100644
--- a/src/libvaladoc/apitree/method.vala
+++ b/src/libvaladoc/apitree/method.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHandler, TemplateParameterListHandler, ReturnTypeHandler {
+public class Valadoc.Api.Method : MemberNode, ParameterListHandler, ExceptionHandler, TemplateParameterListHandler, ReturnTypeHandler {
private Vala.Method vmethod;
- public Method (Vala.Method symbol, Api.Node parent) {
+ public Method (Vala.Method symbol, Node parent) {
base (symbol, parent);
this.vmethod = symbol;
@@ -94,9 +94,9 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
owned get {
if (this.is_constructor) {
if (this.vmethod.name == ".new") {
- return ((Api.Node)this.parent).name;
+ return ((Node)this.parent).name;
} else {
- return ((Api.Node)this.parent).name + "." + this.vmethod.name;
+ return ((Node)this.parent).name + "." + this.vmethod.name;
}
}
else {
@@ -128,7 +128,7 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
if (is_static) {
@@ -150,11 +150,11 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
signature.append_content (type_reference.signature);
signature.append_symbol (this);
- var type_parameters = get_children_by_type (Api.NodeType.TYPE_PARAMETER, false);
+ var type_parameters = get_children_by_type (NodeType.TYPE_PARAMETER, false);
if (type_parameters.size > 0) {
signature.append ("<", false);
bool first = true;
- foreach (Api.Item param in type_parameters) {
+ foreach (Item param in type_parameters) {
if (!first) {
signature.append (",", false);
}
@@ -167,7 +167,7 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
signature.append ("(");
bool first = true;
- foreach (Api.Node param in get_children_by_type (Api.NodeType.FORMAL_PARAMETER)) {
+ foreach (Node param in get_children_by_type (NodeType.FORMAL_PARAMETER)) {
if (!first) {
signature.append (",", false);
}
@@ -177,11 +177,11 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
signature.append (")", false);
- var exceptions = get_children_by_type (Api.NodeType.ERROR_DOMAIN);
+ var exceptions = get_children_by_type (NodeType.ERROR_DOMAIN);
if (exceptions.size > 0) {
signature.append_keyword ("throws");
- foreach (Api.Node param in exceptions) {
+ foreach (Node param in exceptions) {
if (!first) {
signature.append (",", false);
}
@@ -193,13 +193,13 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
return signature.get ();
}
- public void visit (Doclet doclet, Valadoc.MethodHandler in_type) {
+ public void visit (Doclet doclet, Valadoc.Api.MethodHandler in_type) {
doclet.visit_method (this, in_type);
}
- public override Api.NodeType node_type {
+ public override NodeType node_type {
get {
- return is_constructor ? Api.NodeType.CREATION_METHOD : Api.NodeType.METHOD;
+ return is_constructor ? NodeType.CREATION_METHOD : NodeType.METHOD;
}
}
diff --git a/src/libvaladoc/apitree/methodhandler.vala b/src/libvaladoc/apitree/methodhandler.vala
index fba4a64..b7b23d9 100644
--- a/src/libvaladoc/apitree/methodhandler.vala
+++ b/src/libvaladoc/apitree/methodhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,13 +20,13 @@
using Gee;
-public interface Valadoc.MethodHandler : Api.Node {
+public interface Valadoc.Api.MethodHandler : Node {
public void visit_methods (Doclet doclet) {
- accept_children_by_type (Api.NodeType.METHOD, doclet);
+ accept_children_by_type (NodeType.METHOD, doclet);
}
public Collection<Method> get_method_list () {
- return get_children_by_type (Api.NodeType.METHOD);
+ return get_children_by_type (NodeType.METHOD);
}
}
diff --git a/src/libvaladoc/apitree/namespace.vala b/src/libvaladoc/apitree/namespace.vala
index 256c51e..457671c 100644
--- a/src/libvaladoc/apitree/namespace.vala
+++ b/src/libvaladoc/apitree/namespace.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Namespace : Api.SymbolNode, MethodHandler, FieldHandler, NamespaceHandler, ErrorDomainHandler,
+public class Valadoc.Api.Namespace : SymbolNode, MethodHandler, FieldHandler, NamespaceHandler, ErrorDomainHandler,
EnumHandler, ClassHandler, StructHandler, InterfaceHandler,
DelegateHandler, ConstantHandler
{
@@ -50,7 +50,7 @@ public class Valadoc.Namespace : Api.SymbolNode, MethodHandler, FieldHandler, Na
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_keyword (get_accessibility_modifier ())
.append_keyword ("namespace")
.append_symbol (this)
@@ -61,7 +61,7 @@ public class Valadoc.Namespace : Api.SymbolNode, MethodHandler, FieldHandler, Na
doclet.visit_namespace (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.NAMESPACE; } }
+ public override NodeType node_type { get { return NodeType.NAMESPACE; } }
public override void accept (Doclet doclet) {
visit (doclet);
diff --git a/src/libvaladoc/apitree/namespacehandler.vala b/src/libvaladoc/apitree/namespacehandler.vala
index a175986..34796ab 100644
--- a/src/libvaladoc/apitree/namespacehandler.vala
+++ b/src/libvaladoc/apitree/namespacehandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,13 +20,13 @@
using Gee;
-public interface Valadoc.NamespaceHandler : Api.Node {
+public interface Valadoc.Api.NamespaceHandler : Node {
public Collection<Namespace> get_namespace_list (bool filtered = true) {
- return get_children_by_type (Api.NodeType.NAMESPACE, filtered);
+ return get_children_by_type (NodeType.NAMESPACE, filtered);
}
public void visit_namespaces (Doclet doclet) {
- accept_children_by_type (Api.NodeType.NAMESPACE, doclet);
+ accept_children_by_type (NodeType.NAMESPACE, doclet);
}
private ArrayList<Vala.Namespace> create_parent_vnamespace_list (Vala.Symbol vsymbol) {
diff --git a/src/libvaladoc/apitree/package.vala b/src/libvaladoc/apitree/package.vala
index 91542c9..5b2ba70 100644
--- a/src/libvaladoc/apitree/package.vala
+++ b/src/libvaladoc/apitree/package.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Package : Api.Node, NamespaceHandler {
+public class Valadoc.Api.Package : Node, NamespaceHandler {
private ArrayList<Vala.SourceFile> vfiles = new ArrayList<Vala.SourceFile> ();
internal void add_file (Vala.SourceFile vfile) {
@@ -103,14 +103,14 @@ public class Valadoc.Package : Api.Node, NamespaceHandler {
doclet.visit_package ( this );
}
- public override Api.NodeType node_type { get { return Api.NodeType.PACKAGE; } }
+ public override NodeType node_type { get { return NodeType.PACKAGE; } }
public override void accept (Doclet doclet) {
visit (doclet);
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_keyword ("package")
.append (name)
.get ();
diff --git a/src/libvaladoc/apitree/parameterlisthandler.vala b/src/libvaladoc/apitree/parameterlisthandler.vala
index 4d0660c..5b5e55b 100644
--- a/src/libvaladoc/apitree/parameterlisthandler.vala
+++ b/src/libvaladoc/apitree/parameterlisthandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -21,13 +21,13 @@ using Gee;
// TODO Rename FormalParameters
-public interface Valadoc.ParameterListHandler : Api.Node {
+public interface Valadoc.Api.ParameterListHandler : Node {
public Gee.List<FormalParameter> param_list {
owned get { return get_parameter_list (); }
}
public Gee.List<FormalParameter> get_parameter_list () {
- return (Gee.List<FormalParameter>) get_children_by_type (Api.NodeType.FORMAL_PARAMETER);
+ return (Gee.List<FormalParameter>) get_children_by_type (NodeType.FORMAL_PARAMETER);
}
}
diff --git a/src/libvaladoc/apitree/pointer.vala b/src/libvaladoc/apitree/pointer.vala
index b1f0132..3fca05e 100644
--- a/src/libvaladoc/apitree/pointer.vala
+++ b/src/libvaladoc/apitree/pointer.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,15 +20,15 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Pointer : Api.Item {
+public class Valadoc.Api.Pointer : Item {
private Vala.PointerType vtype;
- public Api.Item data_type {
+ public Item data_type {
private set;
get;
}
- public Pointer (Vala.PointerType vtyperef, Api.Item parent) {
+ public Pointer (Vala.PointerType vtyperef, Item parent) {
this.vtype = vtyperef;
this.parent = parent;
@@ -56,7 +56,7 @@ public class Valadoc.Pointer : Api.Item {
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append_content (data_type.signature)
.append ("*", false)
.get ();
diff --git a/src/libvaladoc/apitree/property.vala b/src/libvaladoc/apitree/property.vala
index 13870cc..41dce6f 100644
--- a/src/libvaladoc/apitree/property.vala
+++ b/src/libvaladoc/apitree/property.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Property : Api.MemberNode, ReturnTypeHandler {
+public class Valadoc.Api.Property : MemberNode, ReturnTypeHandler {
private Vala.Property vproperty;
- public Property (Vala.Property symbol, Api.Node parent) {
+ public Property (Vala.Property symbol, Node parent) {
base (symbol, parent);
this.vproperty = symbol;
@@ -107,7 +107,7 @@ public class Valadoc.Property : Api.MemberNode, ReturnTypeHandler {
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
if (is_abstract) {
@@ -139,7 +139,7 @@ public class Valadoc.Property : Api.MemberNode, ReturnTypeHandler {
doclet.visit_property (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.PROPERTY; } }
+ public override NodeType node_type { get { return NodeType.PROPERTY; } }
public override void accept (Doclet doclet) {
visit (doclet);
diff --git a/src/libvaladoc/apitree/propertyaccessor.vala b/src/libvaladoc/apitree/propertyaccessor.vala
index 9aa1b51..76043be 100644
--- a/src/libvaladoc/apitree/propertyaccessor.vala
+++ b/src/libvaladoc/apitree/propertyaccessor.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.PropertyAccessor : Api.SymbolNode {
+public class Valadoc.Api.PropertyAccessor : SymbolNode {
private Vala.PropertyAccessor vpropacc;
public PropertyAccessor (Vala.PropertyAccessor symbol, Property parent) {
@@ -28,7 +28,7 @@ public class Valadoc.PropertyAccessor : Api.SymbolNode {
this.vpropacc = symbol;
}
- public override Api.NodeType node_type { get { return Api.NodeType.PROPERTY_ACCESSOR; } }
+ public override NodeType node_type { get { return NodeType.PROPERTY_ACCESSOR; } }
public override void accept (Doclet doclet) {
}
@@ -58,7 +58,7 @@ public class Valadoc.PropertyAccessor : Api.SymbolNode {
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
if (!is_public) {
signature.append_keyword (get_accessibility_modifier ());
diff --git a/src/libvaladoc/apitree/propertyhandler.vala b/src/libvaladoc/apitree/propertyhandler.vala
index e744feb..e81d88c 100644
--- a/src/libvaladoc/apitree/propertyhandler.vala
+++ b/src/libvaladoc/apitree/propertyhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
-public interface Valadoc.PropertyHandler : Api.Node {
+public interface Valadoc.Api.PropertyHandler : Node {
protected bool is_overwritten_property (Property prop) {
foreach (Property p in get_property_list ()) {
if (p.parent != this) {
@@ -37,11 +37,11 @@ public interface Valadoc.PropertyHandler : Api.Node {
}
public Collection<Property> get_property_list () {
- return get_children_by_type (Api.NodeType.PROPERTY);
+ return get_children_by_type (NodeType.PROPERTY);
}
public void visit_properties (Doclet doclet) {
- accept_children_by_type (Api.NodeType.PROPERTY, doclet);
+ accept_children_by_type (NodeType.PROPERTY, doclet);
}
}
diff --git a/src/libvaladoc/apitree/returntypehandler.vala b/src/libvaladoc/apitree/returntypehandler.vala
index c21a9c0..5180fb6 100644
--- a/src/libvaladoc/apitree/returntypehandler.vala
+++ b/src/libvaladoc/apitree/returntypehandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
-public interface Valadoc.ReturnTypeHandler : Api.Item {
+public interface Valadoc.Api.ReturnTypeHandler : Item {
public abstract TypeReference? type_reference {
protected set;
get;
diff --git a/src/libvaladoc/apitree/signal.vala b/src/libvaladoc/apitree/signal.vala
index 0559ab4..63a65cc 100644
--- a/src/libvaladoc/apitree/signal.vala
+++ b/src/libvaladoc/apitree/signal.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Signal : Api.MemberNode, ParameterListHandler, ReturnTypeHandler {
+public class Valadoc.Api.Signal : MemberNode, ParameterListHandler, ReturnTypeHandler {
private Vala.Signal vsignal;
- public Signal (Vala.Signal symbol, Api.Node parent) {
+ public Signal (Vala.Signal symbol, Node parent) {
base (symbol, parent);
this.vsignal = symbol;
@@ -54,7 +54,7 @@ public class Valadoc.Signal : Api.MemberNode, ParameterListHandler, ReturnTypeHa
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
if (is_virtual) {
@@ -66,7 +66,7 @@ public class Valadoc.Signal : Api.MemberNode, ParameterListHandler, ReturnTypeHa
signature.append ("(");
bool first = true;
- foreach (Api.Node param in get_children_by_type (Api.NodeType.FORMAL_PARAMETER)) {
+ foreach (Node param in get_children_by_type (NodeType.FORMAL_PARAMETER)) {
if (!first) {
signature.append (",", false);
}
@@ -83,7 +83,7 @@ public class Valadoc.Signal : Api.MemberNode, ParameterListHandler, ReturnTypeHa
doclet.visit_signal (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.SIGNAL; } }
+ public override NodeType node_type { get { return NodeType.SIGNAL; } }
public override void accept (Doclet doclet) {
visit (doclet);
diff --git a/src/libvaladoc/apitree/signalhandler.vala b/src/libvaladoc/apitree/signalhandler.vala
index 5ac1905..013519f 100644
--- a/src/libvaladoc/apitree/signalhandler.vala
+++ b/src/libvaladoc/apitree/signalhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@
using Gee;
-public interface Valadoc.SignalHandler : Api.Node {
+public interface Valadoc.Api.SignalHandler : Node {
public void visit_signals (Doclet doclet) {
- accept_children_by_type (Api.NodeType.SIGNAL, doclet);
+ accept_children_by_type (NodeType.SIGNAL, doclet);
}
public Collection<Signal> get_signal_list () {
- return get_children_by_type (Api.NodeType.SIGNAL);
+ return get_children_by_type (NodeType.SIGNAL);
}
}
diff --git a/src/libvaladoc/apitree/signaturebuilder.vala b/src/libvaladoc/apitree/signaturebuilder.vala
index 1b5e13e..63a4930 100644
--- a/src/libvaladoc/apitree/signaturebuilder.vala
+++ b/src/libvaladoc/apitree/signaturebuilder.vala
@@ -1,6 +1,6 @@
/* signaturebuilder.vala
*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
diff --git a/src/libvaladoc/apitree/struct.vala b/src/libvaladoc/apitree/struct.vala
index 828547c..30a6018 100644
--- a/src/libvaladoc/apitree/struct.vala
+++ b/src/libvaladoc/apitree/struct.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,10 +20,10 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.Struct : Api.TypeSymbolNode, MethodHandler, ConstructionMethodHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler {
+public class Valadoc.Api.Struct : TypeSymbolNode, MethodHandler, ConstructionMethodHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler {
private Vala.Struct vstruct;
- public Struct (Vala.Struct symbol, Api.Node parent) {
+ public Struct (Vala.Struct symbol, Node parent) {
base (symbol, parent);
this.vstruct = symbol;
}
@@ -41,7 +41,7 @@ public class Valadoc.Struct : Api.TypeSymbolNode, MethodHandler, ConstructionMet
doclet.visit_struct (this);
}
- public override Api.NodeType node_type { get { return Api.NodeType.STRUCT; } }
+ public override NodeType node_type { get { return NodeType.STRUCT; } }
public override void accept (Doclet doclet) {
visit (doclet);
@@ -63,17 +63,17 @@ public class Valadoc.Struct : Api.TypeSymbolNode, MethodHandler, ConstructionMet
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
signature.append_keyword (get_accessibility_modifier ());
signature.append_keyword ("struct");
signature.append_symbol (this);
- var type_parameters = get_children_by_type (Api.NodeType.TYPE_PARAMETER, false);
+ var type_parameters = get_children_by_type (NodeType.TYPE_PARAMETER, false);
if (type_parameters.size > 0) {
signature.append ("<", false);
bool first = true;
- foreach (Api.Item param in type_parameters) {
+ foreach (Item param in type_parameters) {
if (!first) {
signature.append (",", false);
}
diff --git a/src/libvaladoc/apitree/structhandler.vala b/src/libvaladoc/apitree/structhandler.vala
index 393a4a0..13e7d51 100644
--- a/src/libvaladoc/apitree/structhandler.vala
+++ b/src/libvaladoc/apitree/structhandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,12 +20,12 @@
using Gee;
-public interface Valadoc.StructHandler : Api.Node {
+public interface Valadoc.Api.StructHandler : Node {
public Collection<Struct> get_struct_list () {
- return get_children_by_type (Api.NodeType.STRUCT);
+ return get_children_by_type (NodeType.STRUCT);
}
public void visit_structs (Doclet doclet) {
- accept_children_by_type (Api.NodeType.STRUCT, doclet);
+ accept_children_by_type (NodeType.STRUCT, doclet);
}
}
diff --git a/src/libvaladoc/apitree/symbolaccessibility.vala b/src/libvaladoc/apitree/symbolaccessibility.vala
index 714d2c4..206aaa9 100644
--- a/src/libvaladoc/apitree/symbolaccessibility.vala
+++ b/src/libvaladoc/apitree/symbolaccessibility.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
using Gee;
-public interface Valadoc.SymbolAccessibility {
+public interface Valadoc.Api.SymbolAccessibility {
public abstract bool is_public { get; }
diff --git a/src/libvaladoc/apitree/templateparameterlisthandler.vala b/src/libvaladoc/apitree/templateparameterlisthandler.vala
index b6036f7..d4f496f 100644
--- a/src/libvaladoc/apitree/templateparameterlisthandler.vala
+++ b/src/libvaladoc/apitree/templateparameterlisthandler.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,9 +20,9 @@
using Gee;
-public interface Valadoc.TemplateParameterListHandler : Api.Node {
+public interface Valadoc.Api.TemplateParameterListHandler : Node {
public Collection<TypeParameter> get_template_param_list () {
- return get_children_by_type (Api.NodeType.TYPE_PARAMETER, false);
+ return get_children_by_type (NodeType.TYPE_PARAMETER, false);
}
}
diff --git a/src/libvaladoc/apitree/typeparameter.vala b/src/libvaladoc/apitree/typeparameter.vala
index f204331..c17bf9e 100644
--- a/src/libvaladoc/apitree/typeparameter.vala
+++ b/src/libvaladoc/apitree/typeparameter.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,9 +20,9 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.TypeParameter : Api.SymbolNode, ReturnTypeHandler {
+public class Valadoc.Api.TypeParameter : SymbolNode, ReturnTypeHandler {
- public TypeParameter (Vala.TypeParameter symbol, Api.Node parent) {
+ public TypeParameter (Vala.TypeParameter symbol, Node parent) {
base (symbol, parent);
}
@@ -32,12 +32,12 @@ public class Valadoc.TypeParameter : Api.SymbolNode, ReturnTypeHandler {
}
protected override Inline build_signature () {
- return new Api.SignatureBuilder ()
+ return new SignatureBuilder ()
.append (name)
.get ();
}
- public override Api.NodeType node_type { get { return Api.NodeType.TYPE_PARAMETER; } }
+ public override NodeType node_type { get { return NodeType.TYPE_PARAMETER; } }
public override void accept (Doclet doclet) {
}
diff --git a/src/libvaladoc/apitree/typereference.vala b/src/libvaladoc/apitree/typereference.vala
index 10f3d68..77490a4 100644
--- a/src/libvaladoc/apitree/typereference.vala
+++ b/src/libvaladoc/apitree/typereference.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -20,11 +20,11 @@
using Gee;
using Valadoc.Content;
-public class Valadoc.TypeReference : Api.Item {
+public class Valadoc.Api.TypeReference : Item {
private ArrayList<TypeReference> type_arguments = new ArrayList<TypeReference> ();
private Vala.DataType? vtyperef;
- public TypeReference (Vala.DataType? vtyperef, Api.Item parent) {
+ public TypeReference (Vala.DataType? vtyperef, Item parent) {
this.vtyperef = vtyperef;
this.parent = parent;
}
@@ -41,7 +41,7 @@ public class Valadoc.TypeReference : Api.Item {
}
}
- public Api.Item? data_type {
+ public Item? data_type {
private set;
get;
}
@@ -208,7 +208,7 @@ public class Valadoc.TypeReference : Api.Item {
}
protected override Inline build_signature () {
- var signature = new Api.SignatureBuilder ();
+ var signature = new SignatureBuilder ();
if (is_dynamic) {
signature.append_keyword ("dynamic");
@@ -224,8 +224,8 @@ public class Valadoc.TypeReference : Api.Item {
if (data_type == null) {
signature.append_keyword ("void");
- } else if (data_type is Api.SymbolNode) {
- signature.append_type ((Api.SymbolNode) data_type);
+ } else if (data_type is SymbolNode) {
+ signature.append_type ((SymbolNode) data_type);
} else {
signature.append_content (data_type.signature);
}
@@ -233,7 +233,7 @@ public class Valadoc.TypeReference : Api.Item {
if (type_arguments.size > 0) {
signature.append ("<", false);
bool first = true;
- foreach (Api.Item param in type_arguments) {
+ foreach (Item param in type_arguments) {
if (!first) {
signature.append (",", false);
}
diff --git a/src/libvaladoc/apitree/visitable.vala b/src/libvaladoc/apitree/visitable.vala
index cd002ce..edca259 100644
--- a/src/libvaladoc/apitree/visitable.vala
+++ b/src/libvaladoc/apitree/visitable.vala
@@ -1,5 +1,5 @@
/*
- * Valadoc - a documentation tool for vala.
+ * Valadoc.Api.- a documentation tool for vala.
* Copyright (C) 2008 Florian Brosch
*
* This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@ using Gee;
// Rename to Browsable
-public interface Valadoc.Visitable : Api.Item {
+public interface Valadoc.Api.Visitable : Item {
// Rename to is_browsable
public abstract bool is_visitor_accessible (Settings settings);
diff --git a/src/libvaladoc/content/blockcontent.vala b/src/libvaladoc/content/blockcontent.vala
index 76c4555..9efb6a7 100755
--- a/src/libvaladoc/content/blockcontent.vala
+++ b/src/libvaladoc/content/blockcontent.vala
@@ -36,7 +36,7 @@ public abstract class Valadoc.Content.BlockContent : ContentElement {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
foreach (Block element in _content) {
element.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/comment.vala b/src/libvaladoc/content/comment.vala
index 0c4d40d..8830187 100755
--- a/src/libvaladoc/content/comment.vala
+++ b/src/libvaladoc/content/comment.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.Comment : BlockContent {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
base.check (api_root, container, reporter);
foreach (Taglet element in _taglets) {
diff --git a/src/libvaladoc/content/contentelement.vala b/src/libvaladoc/content/contentelement.vala
index a4c7e80..9dad4ca 100755
--- a/src/libvaladoc/content/contentelement.vala
+++ b/src/libvaladoc/content/contentelement.vala
@@ -29,7 +29,7 @@ public abstract class Valadoc.Content.ContentElement : Object {
public virtual void configure (Settings settings, ResourceLocator locator) {
}
- public abstract void check (Tree api_root, Api.Node? container, ErrorReporter reporter);
+ public abstract void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter);
public abstract void accept (ContentVisitor visitor);
diff --git a/src/libvaladoc/content/embedded.vala b/src/libvaladoc/content/embedded.vala
index 74b64f0..23b1d5d 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 (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check the image exists if it a local resource
}
diff --git a/src/libvaladoc/content/headline.vala b/src/libvaladoc/content/headline.vala
index 7cd3236..f50df5e 100755
--- a/src/libvaladoc/content/headline.vala
+++ b/src/libvaladoc/content/headline.vala
@@ -32,7 +32,7 @@ public class Valadoc.Content.Headline : Block, InlineContent {
_level = 0;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO report error if level == 0 ?
// Check inline content
diff --git a/src/libvaladoc/content/inlinecontent.vala b/src/libvaladoc/content/inlinecontent.vala
index 84f6b72..cb707fd 100755
--- a/src/libvaladoc/content/inlinecontent.vala
+++ b/src/libvaladoc/content/inlinecontent.vala
@@ -36,7 +36,7 @@ public abstract class Valadoc.Content.InlineContent : ContentElement {
internal InlineContent () {
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
foreach (Inline element in _content) {
element.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala
index e0052b9..aa75cb9 100755
--- a/src/libvaladoc/content/inlinetaglet.vala
+++ b/src/libvaladoc/content/inlinetaglet.vala
@@ -49,7 +49,7 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl
this.locator = locator;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
ContentElement element = get_content ();
element.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/link.vala b/src/libvaladoc/content/link.vala
index 061f53e..f26fb97 100755
--- a/src/libvaladoc/content/link.vala
+++ b/src/libvaladoc/content/link.vala
@@ -35,7 +35,7 @@ public class Valadoc.Content.Link : ContentElement, Inline {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/list.vala b/src/libvaladoc/content/list.vala
index c92f864..9b63a1b 100755
--- a/src/libvaladoc/content/list.vala
+++ b/src/libvaladoc/content/list.vala
@@ -34,7 +34,7 @@ public class Valadoc.Content.List : ContentElement, Block {
_items = new ArrayList<ListItem> ();
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check the list consistency in terms of successive item levels ?
// Check individual list items
diff --git a/src/libvaladoc/content/listitem.vala b/src/libvaladoc/content/listitem.vala
index 89490e5..947e813 100755
--- a/src/libvaladoc/content/listitem.vala
+++ b/src/libvaladoc/content/listitem.vala
@@ -44,7 +44,7 @@ public class Valadoc.Content.ListItem : InlineContent {
_level = 0;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO report error if level == 0 ?
// Check inline content
diff --git a/src/libvaladoc/content/paragraph.vala b/src/libvaladoc/content/paragraph.vala
index f154b14..5d7dbc0 100755
--- a/src/libvaladoc/content/paragraph.vala
+++ b/src/libvaladoc/content/paragraph.vala
@@ -33,7 +33,7 @@ public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes {
base ();
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check inline content
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/run.vala b/src/libvaladoc/content/run.vala
index 341ed97..a357d9c 100755
--- a/src/libvaladoc/content/run.vala
+++ b/src/libvaladoc/content/run.vala
@@ -44,7 +44,7 @@ public class Valadoc.Content.Run : InlineContent, Inline {
_style = style;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check inline content
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/sourcecode.vala b/src/libvaladoc/content/sourcecode.vala
index 07c262f..c0bb075 100755
--- a/src/libvaladoc/content/sourcecode.vala
+++ b/src/libvaladoc/content/sourcecode.vala
@@ -39,7 +39,7 @@ public class Valadoc.Content.SourceCode : ContentElement, Block {
_language = Language.VALA;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/symbollink.vala b/src/libvaladoc/content/symbollink.vala
index fbed643..afe8e07 100755
--- a/src/libvaladoc/content/symbollink.vala
+++ b/src/libvaladoc/content/symbollink.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.SymbolLink : ContentElement, Inline {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/table.vala b/src/libvaladoc/content/table.vala
index 3371faa..ec55d2a 100755
--- a/src/libvaladoc/content/table.vala
+++ b/src/libvaladoc/content/table.vala
@@ -34,7 +34,7 @@ public class Valadoc.Content.Table : ContentElement, Block {
_rows = new ArrayList<TableRow> ();
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// 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 984bf57..d844152 100755
--- a/src/libvaladoc/content/tablecell.vala
+++ b/src/libvaladoc/content/tablecell.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.TableCell : InlineContent, StyleAttributes {
_rowspan = 1;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check inline content
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/tablerow.vala b/src/libvaladoc/content/tablerow.vala
index 86f5736..0354611 100755
--- a/src/libvaladoc/content/tablerow.vala
+++ b/src/libvaladoc/content/tablerow.vala
@@ -34,7 +34,7 @@ public class Valadoc.Content.TableRow : ContentElement {
_cells = new ArrayList<TableCell> ();
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check individual cells
foreach (var cell in _cells) {
cell.check (api_root, container, reporter);
diff --git a/src/libvaladoc/content/text.vala b/src/libvaladoc/content/text.vala
index 3b7d7a2..406b2e0 100755
--- a/src/libvaladoc/content/text.vala
+++ b/src/libvaladoc/content/text.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.Text : ContentElement, Inline {
}
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/doclet.vala b/src/libvaladoc/doclet.vala
index 1d2c85b..c207c58 100755
--- a/src/libvaladoc/doclet.vala
+++ b/src/libvaladoc/doclet.vala
@@ -18,27 +18,25 @@
*/
using Gee;
+using Valadoc.Api;
-
-public static delegate Type Valadoc.DocletRegisterFunction ( );
-
+public static delegate Type Valadoc.DocletRegisterFunction ();
public abstract class Valadoc.Doclet : GLib.Object {
- public abstract void initialisation (Settings settings, Tree tree);
- public abstract void visit_package (Package pkg);
- public abstract void visit_namespace (Namespace ns);
- public abstract void visit_interface (Interface iface);
- public abstract void visit_class (Class cl);
- public abstract void visit_struct (Struct stru);
- public abstract void visit_error_domain (ErrorDomain errdom);
- public abstract void visit_enum (Enum en);
- public abstract void visit_property (Property prop);
- public abstract void visit_field (Field field, FieldHandler parent);
- public abstract void visit_constant (Constant constant, ConstantHandler parent);
- public abstract void visit_error_code (ErrorCode errcode);
- public abstract void visit_enum_value (EnumValue enval);
- public abstract void visit_delegate (Delegate del);
- public abstract void visit_signal (Signal sig);
- public abstract void visit_method (Method m, Valadoc.MethodHandler parent);
+ public abstract void initialisation (Settings settings, Api.Tree tree);
+ public abstract void visit_package (Api.Package pkg);
+ public abstract void visit_namespace (Api.Namespace ns);
+ public abstract void visit_interface (Api.Interface iface);
+ public abstract void visit_class (Api.Class cl);
+ public abstract void visit_struct (Api.Struct stru);
+ public abstract void visit_error_domain (Api.ErrorDomain errdom);
+ public abstract void visit_enum (Api.Enum en);
+ public abstract void visit_property (Api.Property prop);
+ public abstract void visit_field (Api.Field field, Api.FieldHandler parent);
+ public abstract void visit_constant (Api.Constant constant, Api.ConstantHandler parent);
+ public abstract void visit_error_code (Api.ErrorCode errcode);
+ public abstract void visit_enum_value (Api.EnumValue enval);
+ public abstract void visit_delegate (Api.Delegate del);
+ public abstract void visit_signal (Api.Signal sig);
+ public abstract void visit_method (Api.Method m, Api.MethodHandler parent);
}
-
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 35d4805..13c0814 100644
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -27,7 +27,7 @@ using Gee;
public class Valadoc.DocumentationParser : Object, ResourceLocator {
- public DocumentationParser (Settings settings, ErrorReporter reporter, Tree tree, ModuleLoader modules) {
+ public DocumentationParser (Settings settings, ErrorReporter reporter, Api.Tree tree, ModuleLoader modules) {
_settings = settings;
_reporter = reporter;
_tree = tree;
@@ -48,7 +48,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
private Settings _settings;
private ErrorReporter _reporter;
- private Tree _tree;
+ private Api.Tree _tree;
private ModuleLoader _modules;
private ContentFactory _factory;
diff --git a/src/libvaladoc/drawer.vala b/src/libvaladoc/drawer.vala
index 9ae0b3d..464c55c 100755
--- a/src/libvaladoc/drawer.vala
+++ b/src/libvaladoc/drawer.vala
@@ -19,7 +19,7 @@
using Graphviz;
using Gee;
-
+using Valadoc.Api;
namespace Valadoc.Diagrams {
// replace with .full_name
diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala
index 9ee71dd..281369b 100755
--- a/src/libvaladoc/taglets/tagletdeprecated.vala
+++ b/src/libvaladoc/taglets/tagletdeprecated.vala
@@ -29,7 +29,7 @@ public class Valadoc.Taglets.Deprecated : InlineContent, Taglet, Block {
return run_rule;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala
index 1ed9711..551408f 100755
--- a/src/libvaladoc/taglets/tagletinheritdoc.vala
+++ b/src/libvaladoc/taglets/tagletinheritdoc.vala
@@ -24,7 +24,6 @@
using Gee;
using Valadoc.Content;
-
public class Valadoc.Taglets.InheritDoc : InlineTaglet {
private Api.Node? _inherited;
@@ -32,14 +31,14 @@ public class Valadoc.Taglets.InheritDoc : InlineTaglet {
return null;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO Check that the container is an override of an abstract symbol
// Also retrieve that abstract symbol _inherited
- if (container is Method) {
- _inherited = ((Method) container).base_method;
- } else if (container is Property) {
- _inherited = ((Property) container).base_property;
+ if (container is Api.Method) {
+ _inherited = ((Api.Method) container).base_method;
+ } else if (container is Api.Property) {
+ _inherited = ((Api.Property) container).base_property;
}
// TODO report error if inherited is null
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index f08d74c..84630d1 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -36,7 +36,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
});
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
_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 713bc21..6749116 100755
--- a/src/libvaladoc/taglets/tagletparam.vala
+++ b/src/libvaladoc/taglets/tagletparam.vala
@@ -36,7 +36,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
});
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO check for the existence of such a parameter
base.check (api_root, container, reporter);
diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala
index 5e42120..baa985b 100755
--- a/src/libvaladoc/taglets/tagletreturn.vala
+++ b/src/libvaladoc/taglets/tagletreturn.vala
@@ -30,7 +30,7 @@ public class Valadoc.Taglets.Return : InlineContent, Taglet, Block {
return run_rule;
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO check for the existence of a return type
base.check (api_root, container, reporter);
diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index 82feaca..f93c056 100755
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -35,7 +35,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
});
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
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 edcee9c..32535c0 100755
--- a/src/libvaladoc/taglets/tagletsince.vala
+++ b/src/libvaladoc/taglets/tagletsince.vala
@@ -34,7 +34,7 @@ public class Valadoc.Taglets.Since : ContentElement, Taglet, Block {
});
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index 891ecba..98af086 100755
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -24,7 +24,6 @@
using Gee;
using Valadoc.Content;
-
public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
public string error_domain_name { private set; get; }
public Api.Node error_domain { private set; get; }
@@ -37,7 +36,7 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
});
}
- public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
+ public override void check (Api.Tree api_root, Api.Node? container, ErrorReporter reporter) {
error_domain = api_root.search_symbol_str (container, error_domain_name);
if (error_domain == null) {
// TODO use ContentElement's source reference
diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index 6d95ea1..c9c17e3 100755
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -179,7 +179,7 @@ public class ValaDoc : Object {
}
- Valadoc.Tree doctree = new Valadoc.Tree (reporter, settings);
+ Valadoc.Api.Tree doctree = new Valadoc.Api.Tree (reporter, settings);
Valadoc.DocumentationParser docparser = new Valadoc.DocumentationParser (settings, reporter, doctree, modules);
if (reporter.errors > 0) {
return quit (reporter);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
