[valadoc] libvaladoc: Replace deprecated function calls

[Florian Brosch <flobrosch src gnome org>]

commit 794768570e93bdb19054c572e46bb6526fcf56ef
Author: Florian Brosch <flo brosch gmail com>
Date:   Tue Feb 8 17:07:29 2011 +0100

    libvaladoc: Replace deprecated function calls

 src/doclets/devhelp/doclet.vala                    |    4 -
 src/doclets/htm/doclet.vala                        |    4 -
 src/libvaladoc/api/tree.vala                       |    2 +-
 src/libvaladoc/filehelper.vala                     |   74 +-------------------
 src/libvaladoc/html/basicdoclet.vala               |    2 +-
 src/libvaladoc/html/linkhelper.vala                |    3 +-
 .../importer/valadocdocumentationimporter.vala     |    2 +-
 src/libvaladoc/taglets/tagletlink.vala             |    2 +-
 src/libvaladoc/taglets/tagletsee.vala              |    2 +-
 9 files changed, 8 insertions(+), 87 deletions(-)
---
diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index 2496391..e369337 100755
--- a/src/doclets/devhelp/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -40,10 +40,6 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 
 	private Devhelp.MarkupWriter _devhelpwriter;
 
-	construct {
-		_renderer = new HtmlRenderer (this);
-	}
-
 	private string get_path (Api.Node element) {
 		return element.get_full_name () + ".html";
 	}
diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index a93e5a7..0faf737 100755
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -37,10 +37,6 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 	private const string js_path_wiki = "../scripts.js";
 	private const string js_path = "../scripts.js";
 
-	construct {
-		_renderer = new HtmlRenderer (this);
-	}
-
 	private string get_real_path ( Api.Node element ) {
 		return GLib.Path.build_filename ( this.settings.path, element.package.name, element.get_full_name () + ".html" );
 	}
diff --git a/src/libvaladoc/api/tree.vala b/src/libvaladoc/api/tree.vala
index 42835d3..254dcc0 100644
--- a/src/libvaladoc/api/tree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -324,7 +324,7 @@ public class Valadoc.Api.Tree {
 					context.add_source_file (source_file);
 				} else if (source.has_suffix (".vapi")) {
 					string file_name = Path.get_basename (source);
-					file_name = file_name.ndup (file_name.length - ".vapi".length);
+					file_name = file_name.substring (0, file_name.length - ".vapi".length);
 
 					var vfile = new Vala.SourceFile (context, Vala.SourceFileType.PACKAGE, rpath);
 					Package vdpkg = new Package (vfile, file_name);
diff --git a/src/libvaladoc/filehelper.vala b/src/libvaladoc/filehelper.vala
index a14f8ae..edd47bf 100755
--- a/src/libvaladoc/filehelper.vala
+++ b/src/libvaladoc/filehelper.vala
@@ -91,78 +91,8 @@ namespace Valadoc {
 		return true;
 	}
 
-	/* cp from valacompiler.vala, ported from glibc */
-	private static bool ends_with_dir_separator (string s) {
-		return Path.is_dir_separator (s.offset (s.length - 1).get_char ());
-	}
-
-	public string realpath (string name) {
-		string rpath;
-
-		// start of path component
-		weak string start;
-		// end of path component
-		weak string end;
-
-		if (!Path.is_absolute (name)) {
-			// relative path
-			rpath = Environment.get_current_dir ();
-
-			start = end = name;
-		} else {
-			// set start after root
-			start = end = Path.skip_root (name);
-
-			// extract root
-			rpath = name.substring (0, name.pointer_to_offset (start));
-		}
-
-		long root_len = rpath.pointer_to_offset (Path.skip_root (rpath));
-
-		for (; start.get_char () != 0; start = end) {
-			// skip sequence of multiple path-separators
-			while (Path.is_dir_separator (start.get_char ())) {
-				start = start.next_char ();
-			}
-
-			// find end of path component
-			long len = 0;
-			for (end = start; end.get_char () != 0 && !Path.is_dir_separator (end.get_char ()); end = end.next_char ()) {
-				len++;
-			}
-
-			if (len == 0) {
-				break;
-			} else if (len == 1 && start.get_char () == '.') {
-				// do nothing
-			} else if (len == 2 && start.has_prefix ("..")) {
-				// back up to previous component, ignore if at root already
-				if (rpath.length > root_len) {
-					do {
-						rpath = rpath.substring (0, rpath.length - 1);
-					} while (!ends_with_dir_separator (rpath));
-				}
-			} else {
-				if (!ends_with_dir_separator (rpath)) {
-					rpath += Path.DIR_SEPARATOR_S;
-				}
-
-				rpath += start.substring (0, len);
-			}
-		}
-
-		if (rpath.length > root_len && ends_with_dir_separator (rpath)) {
-			rpath = rpath.substring (0, rpath.length - 1);
-		}
-
-		if (Path.DIR_SEPARATOR != '/') {
-			// don't use backslashes internally,
-			// to avoid problems in #include directives
-			string[] components = rpath.split ("\\");
-			rpath = string.joinv ("/", components);
-		}
-
-		return rpath;
+	public string realpath (string basedir) {
+		return Vala.CodeContext.realpath (basedir);
 	}
 }
 
diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index e32e818..acda5d8 100755
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -182,7 +182,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 	}
 
 	protected virtual void write_wiki_page (WikiPage page, string contentp, string css_path, string js_path, string pkg_name) {
-		GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.length-7).replace ("/", ".")+"html"), "w");
+		GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.substring (0, page.name.length-7).replace ("/", ".")+"html"), "w");
 		writer = new MarkupWriter (file);
 		_renderer.set_writer (writer);
 		this.write_file_header (css_path, js_path, pkg_name);
diff --git a/src/libvaladoc/html/linkhelper.vala b/src/libvaladoc/html/linkhelper.vala
index 83e4747..e7cf4e7 100644
--- a/src/libvaladoc/html/linkhelper.vala
+++ b/src/libvaladoc/html/linkhelper.vala
@@ -78,8 +78,7 @@ public class Valadoc.Html.LinkHelper : Object {
 
 	private string translate_wiki_name (WikiPage page) {
 		var name = page.name;
-
-		return name.ndup (name.pointer_to_offset (name.chr (-1, '.'))).replace ("/", ".") + ".html";
+		return name.substring (name.last_index_of_char ('.')).replace ("/", ".") + ".html";
 	}
 
 
diff --git a/src/libvaladoc/importer/valadocdocumentationimporter.vala b/src/libvaladoc/importer/valadocdocumentationimporter.vala
index 2f11f44..c35bd37 100644
--- a/src/libvaladoc/importer/valadocdocumentationimporter.vala
+++ b/src/libvaladoc/importer/valadocdocumentationimporter.vala
@@ -115,7 +115,7 @@ public class Valadoc.Importer.ValadocDocumentationImporter : DocumentationImport
 		Api.Node? symbol = null;
 
 		if (symbol_name.has_prefix ("c::")) {
-			symbol = tree.search_symbol_cstr (symbol_name.offset (3));
+			symbol = tree.search_symbol_cstr (symbol_name.substring (3));
 		} else {
 			symbol = tree.search_symbol_str (null, symbol_name);
 		}
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index ad77b4c..d7fba14 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -37,7 +37,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		if (symbol_name.has_prefix ("c::")) {
-			_symbol_name = _symbol_name.offset (3);
+			_symbol_name = _symbol_name.substring (3);
 			_symbol = api_root.search_symbol_cstr (symbol_name);
 			if (_symbol != null) {
 				symbol_name = _symbol.name;
diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index e1b3dc5..bea41d5 100755
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -36,7 +36,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
 
 	public override void check (Api.Tree api_root, Api.Node container, ErrorReporter reporter, Settings settings) {
 		if (symbol_name.has_prefix ("c::")) {
-			symbol_name = symbol_name.offset (3);
+			symbol_name = symbol_name.substring (3);
 			symbol = api_root.search_symbol_cstr (symbol_name);
 			if (symbol != null) {
 				symbol_name = _symbol.name;