From 6e1570da371472be99d1336564522bfcf3d90b3f Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 12 Jun 2018 12:21:40 +0200 Subject: [PATCH] libvaladoc: Avoid superfluous references of MarkupWriter --- libvaladoc/devhelp-markupwriter.vala | 18 +++++++++--------- libvaladoc/html/htmlmarkupwriter.vala | 10 +++++----- libvaladoc/markupwriter.vala | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libvaladoc/devhelp-markupwriter.vala b/libvaladoc/devhelp-markupwriter.vala index d86808026..36b3b3979 100644 --- a/libvaladoc/devhelp-markupwriter.vala +++ b/libvaladoc/devhelp-markupwriter.vala @@ -39,7 +39,7 @@ public class Valadoc.Devhelp.MarkupWriter : Valadoc.MarkupWriter { || name == "sub"; } - public MarkupWriter start_book (string title, string lang, string link, string name, string version, string author) { + public unowned MarkupWriter start_book (string title, string lang, string link, string name, string version, string author) { this.start_tag ("book", {"xmlns", "http://www.devhelp.net/book", "title", title, "language", lang, @@ -50,42 +50,42 @@ public class Valadoc.Devhelp.MarkupWriter : Valadoc.MarkupWriter { return this; } - public MarkupWriter end_book () { + public unowned MarkupWriter end_book () { this.end_tag ("book"); return this; } - public MarkupWriter start_functions () { + public unowned MarkupWriter start_functions () { this.start_tag ("functions"); return this; } - public MarkupWriter end_functions () { + public unowned MarkupWriter end_functions () { this.end_tag ("functions"); return this; } - public MarkupWriter start_chapters () { + public unowned MarkupWriter start_chapters () { this.start_tag ("chapters"); return this; } - public MarkupWriter end_chapters () { + public unowned MarkupWriter end_chapters () { this.end_tag ("chapters"); return this; } - public MarkupWriter start_sub (string name, string link) { + public unowned MarkupWriter start_sub (string name, string link) { this.start_tag ("sub", {"name", name, "link", link}); return this; } - public MarkupWriter end_sub () { + public unowned MarkupWriter end_sub () { this.end_tag ("sub"); return this; } - public MarkupWriter keyword (string name, string type, string link) { + public unowned MarkupWriter keyword (string name, string type, string link) { this.start_tag ("keyword", {"type", type, "name", name, "link", link}); this.end_tag ("keyword"); return this; diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala index 15ed9efd1..3a3be3de0 100644 --- a/libvaladoc/html/htmlmarkupwriter.vala +++ b/libvaladoc/html/htmlmarkupwriter.vala @@ -43,7 +43,7 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { }, xml_declaration); } - public MarkupWriter add_usemap (Charts.Chart chart) { + public unowned MarkupWriter add_usemap (Charts.Chart chart) { string? buf = (string?) chart.write_buffer ("cmapx"); if (buf != null) { raw_text ("\n"); @@ -54,7 +54,7 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { } // edit - public MarkupWriter link (string url, string label, string? css_class = null) { + public unowned MarkupWriter link (string url, string label, string? css_class = null) { if (css_class == null) { start_tag ("a", {"href", url}); } else { @@ -66,7 +66,7 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { return this; } - public MarkupWriter image (string src, string? caption = null, string? css_class = null) { + public unowned MarkupWriter image (string src, string? caption = null, string? css_class = null) { if (css_class == null) { simple_tag ("img", {"src", src, "alt", caption}); } else { @@ -75,12 +75,12 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { return this; } - public MarkupWriter stylesheet_link (string url) { + public unowned MarkupWriter stylesheet_link (string url) { simple_tag ("link", {"href", url, "rel", "stylesheet", "type", "text/css"}); return this; } - public MarkupWriter javascript_link (string url) { + public unowned MarkupWriter javascript_link (string url) { start_tag ("script", {"src", url, "type", "text/javascript"}); end_tag ("script"); return this; diff --git a/libvaladoc/markupwriter.vala b/libvaladoc/markupwriter.vala index 4bec5199e..b796aa5b7 100644 --- a/libvaladoc/markupwriter.vala +++ b/libvaladoc/markupwriter.vala @@ -109,7 +109,7 @@ public class Valadoc.MarkupWriter { * @param attributes a list of name/value pairs * @return this */ - public MarkupWriter start_tag (string name, string[]? attributes=null) { + public unowned MarkupWriter start_tag (string name, string[]? attributes=null) { indent++; check_column (name); @@ -139,7 +139,7 @@ public class Valadoc.MarkupWriter { * @param attributes a list of name/value pairs * @return this */ - public MarkupWriter simple_tag (string name, string[]? attributes=null) { + public unowned MarkupWriter simple_tag (string name, string[]? attributes=null) { indent++; check_column (name); @@ -169,7 +169,7 @@ public class Valadoc.MarkupWriter { * @param name the name of the markup * @return this */ - public MarkupWriter end_tag (string name) { + public unowned MarkupWriter end_tag (string name) { check_column (name, true); do_write ("".printf (name)); indent--; @@ -183,7 +183,7 @@ public class Valadoc.MarkupWriter { * @see raw_text * @return this */ - public MarkupWriter text (string text) { + public unowned MarkupWriter text (string text) { if (wrap && text.length + current_column > MAX_COLUMN) { long wrote = 0; while (wrote < text.length) { @@ -223,7 +223,7 @@ public class Valadoc.MarkupWriter { * @see text * @return this */ - public MarkupWriter raw_text (string text) { + public unowned MarkupWriter raw_text (string text) { do_write (text); last_was_tag = false; return this; -- 2.47.2