[valadoc] Fix warnings accessing static members
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valadoc] Fix warnings accessing static members
- Date: Sat, 15 Jun 2013 14:47:43 +0000 (UTC)
commit e90f91d5e9e9a29a15f20d28a67df72ecc52d8c9
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Jun 15 16:28:20 2013 +0200
Fix warnings accessing static members
src/doclets/devhelp/doclet.vala | 2 +-
src/doclets/htm/doclet.vala | 6 ++--
src/valadoc/valadoc.vala | 44 +++++++++++++++++++-------------------
3 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index bd10d48..548b6db 100644
--- a/src/doclets/devhelp/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -99,7 +99,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
GLib.FileStream file = GLib.FileStream.open (filepath, "w");
writer = new Html.MarkupWriter (file);
_renderer.set_writer (writer);
- write_file_header (this.css_path, this.js_path, pkg_name);
+ write_file_header (Valadoc.Devhelp.Doclet.css_path, Valadoc.Devhelp.Doclet.js_path, pkg_name);
write_package_content (package, package);
write_file_footer ();
file = null;
diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index 29313d5..0d0f3aa 100644
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -84,7 +84,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
GLib.FileStream file = GLib.FileStream.open (GLib.Path.build_filename (settings.path,
"index.html"), "w");
writer = new Html.MarkupWriter (file);
_renderer.set_writer (writer);
- write_file_header (this.css_path_package, this.js_path_package, settings.pkg_name);
+ write_file_header (Valadoc.HtmlDoclet.css_path_package, Valadoc.HtmlDoclet.js_path_package,
settings.pkg_name);
write_navi_packages (tree);
write_package_index_content (tree);
write_file_footer ();
@@ -112,7 +112,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
GLib.FileStream file = GLib.FileStream.open (GLib.Path.build_filename (path, "index.htm"),
"w");
writer = new Html.MarkupWriter (file);
_renderer.set_writer (writer);
- write_file_header (this.css_path, this.js_path, pkg_name);
+ write_file_header (Valadoc.HtmlDoclet.css_path, Valadoc.HtmlDoclet.js_path, pkg_name);
write_navi_package (package);
write_package_content (package, package);
write_file_footer ();
@@ -128,7 +128,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
GLib.FileStream file = GLib.FileStream.open (rpath, "w");
writer = new Html.MarkupWriter (file);
_renderer.set_writer (writer);
- write_file_header (this.css_path, this.js_path, ns.get_full_name () + " – " +
ns.package.name);
+ write_file_header (Valadoc.HtmlDoclet.css_path, Valadoc.HtmlDoclet.js_path,
ns.get_full_name () + " – " + ns.package.name);
write_navi_symbol (ns);
write_namespace_content (ns, ns);
write_file_footer ();
diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index cca16b1..9f6256f 100644
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -148,15 +148,15 @@ public class ValaDoc : Object {
}
private string get_pkg_name () {
- if (this.pkg_name == null) {
- if (this.directory.has_suffix ("/")) {
- this.pkg_name = GLib.Path.get_dirname (this.directory);
+ if (ValaDoc.pkg_name == null) {
+ if (ValaDoc.directory.has_suffix ("/")) {
+ ValaDoc.pkg_name = GLib.Path.get_dirname (ValaDoc.directory);
} else {
- this.pkg_name = GLib.Path.get_basename (this.directory);
+ ValaDoc.pkg_name = GLib.Path.get_basename (ValaDoc.directory);
}
}
- return this.pkg_name;
+ return ValaDoc.pkg_name;
}
private ModuleLoader? create_module_loader (ErrorReporter reporter, out Doclet? doclet, out Driver?
driver) {
@@ -201,25 +201,25 @@ public class ValaDoc : Object {
reporter.settings = settings;
settings.pkg_name = this.get_pkg_name ();
- settings.gir_namespace = this.gir_namespace;
- settings.gir_version = this.gir_version;
- if (this.gir_name != null) {
- settings.gir_name = GLib.Path.get_basename (this.gir_name);
- settings.gir_directory = GLib.Path.get_dirname (this.gir_name);
+ settings.gir_namespace = ValaDoc.gir_namespace;
+ settings.gir_version = ValaDoc.gir_version;
+ if (ValaDoc.gir_name != null) {
+ settings.gir_name = GLib.Path.get_basename (ValaDoc.gir_name);
+ settings.gir_directory = GLib.Path.get_dirname (ValaDoc.gir_name);
if (settings.gir_directory == "") {
- settings.gir_directory = GLib.Path.get_dirname (this.directory);
+ settings.gir_directory = GLib.Path.get_dirname (ValaDoc.directory);
}
}
- settings.pkg_version = this.pkg_version;
- settings.add_inherited = this.add_inherited;
- settings._protected = this._protected;
- settings._internal = this._internal;
- settings.with_deps = this.with_deps;
- settings._private = this._private;
- settings.path = realpath (this.directory);
- settings.verbose = this.verbose;
- settings.wiki_directory = this.wikidirectory;
- settings.pluginargs = this.pluginargs;
+ settings.pkg_version = ValaDoc.pkg_version;
+ settings.add_inherited = ValaDoc.add_inherited;
+ settings._protected = ValaDoc._protected;
+ settings._internal = ValaDoc._internal;
+ settings.with_deps = ValaDoc.with_deps;
+ settings._private = ValaDoc._private;
+ settings.path = realpath (ValaDoc.directory);
+ settings.verbose = ValaDoc.verbose;
+ settings.wiki_directory = ValaDoc.wikidirectory;
+ settings.pluginargs = ValaDoc.pluginargs;
settings.experimental = experimental;
settings.experimental_non_null = experimental_non_null;
@@ -280,7 +280,7 @@ public class ValaDoc : Object {
return quit (reporter);
}
- if (this.gir_name != null) {
+ if (ValaDoc.gir_name != null) {
driver.write_gir (settings, reporter);
if (reporter.errors > 0) {
return quit (reporter);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]