valadoc r26 - in trunk/src: doclets/devhelp/doclet libvaladoc valadoc

[flobrosch svn gnome org]

Author: flobrosch
Date: Wed Dec 24 13:48:36 2008
New Revision: 26
URL: http://svn.gnome.org/viewvc/valadoc?rev=26&view=rev

Log:

valac-0.5.3



Removed:
   trunk/src/libvaladoc/xmlimporter.vala
   trunk/src/libvaladoc/xmlparser.vala
Modified:
   trunk/src/doclets/devhelp/doclet/template.vala
   trunk/src/libvaladoc/Makefile.am
   trunk/src/libvaladoc/doctree.vala
   trunk/src/libvaladoc/parser.vala
   trunk/src/libvaladoc/settings.vala
   trunk/src/valadoc/valadoc.vala

Modified: trunk/src/doclets/devhelp/doclet/template.vala
==============================================================================
--- trunk/src/doclets/devhelp/doclet/template.vala	(original)
+++ trunk/src/doclets/devhelp/doclet/template.vala	Wed Dec 24 13:48:36 2008
@@ -65,11 +65,11 @@
 	private Xml.Node* functions = null;
 	private Xml.Node* chapters = null;
 	private Xml.Node* current = null;
-
+/*
 	~DevhelpFormat ( ) {
 		delete this.devhelp;
 	}
-
+*/
 	public void save_file ( string path ) {
 		Xml.Doc.save_format_file ( path, this.devhelp, 1 );
 	}

Modified: trunk/src/libvaladoc/Makefile.am
==============================================================================
--- trunk/src/libvaladoc/Makefile.am	(original)
+++ trunk/src/libvaladoc/Makefile.am	Wed Dec 24 13:48:36 2008
@@ -10,8 +10,6 @@
 	parser.vala          \
 	doctree.vala         \
 	langlet.vala         \
-	xmlparser.vala       \
-	xmlimporter.vala     \
 	$(NULL)
 
 

Modified: trunk/src/libvaladoc/doctree.vala
==============================================================================
--- trunk/src/libvaladoc/doctree.vala	(original)
+++ trunk/src/libvaladoc/doctree.vala	Wed Dec 24 13:48:36 2008
@@ -4461,10 +4461,7 @@
 public class Valadoc.Tree : Vala.CodeVisitor {
 	private Gee.ArrayList<Package> files = new Gee.ArrayList<Package>();
 
-	public Valadoc.Settings settings {
-		construct set;
-		private get;
-	}
+	private Valadoc.Settings settings;
 
 	public Tree (	Valadoc.Settings settings,
 					bool non_null_experimental,
@@ -4606,10 +4603,7 @@
 		return true;
 	}
 
-	public CodeContext context {
-		construct set;
-		private get;
-	}
+	private CodeContext context;
 
 	public void visit ( Doclet doclet ) {
 		foreach ( Package file in this.files ) {
@@ -4695,7 +4689,7 @@
 			return tmp;
 
 		if ( element != null ) {
-			var tmp = this.search_symbol_in_namespaces ( element, params );
+			tmp = this.search_symbol_in_namespaces ( element, params );
 			if ( tmp != null )
 				return tmp;
 		}

Modified: trunk/src/libvaladoc/parser.vala
==============================================================================
--- trunk/src/libvaladoc/parser.vala	(original)
+++ trunk/src/libvaladoc/parser.vala	Wed Dec 24 13:48:36 2008
@@ -286,8 +286,8 @@
 
 		foreach ( Gee.ArrayList<MainTaglet> tags in alst ) {
 			MainTaglet ftag = tags.get ( 0 );
-			int max = tags.size;
-			int i = 0;
+			max = tags.size;
+			i = 0;
 
 			tmp = ftag.write_block_start ( res );
 			if ( tmp == false )

Modified: trunk/src/libvaladoc/settings.vala
==============================================================================
--- trunk/src/libvaladoc/settings.vala	(original)
+++ trunk/src/libvaladoc/settings.vala	Wed Dec 24 13:48:36 2008
@@ -21,7 +21,6 @@
 
 
 public class Valadoc.Settings : Object {
-	public Gee.ArrayList<string> files;
 	private string rpath;
 	public string path = "documentation/";
 	public string pkg_name = null;
@@ -43,32 +42,6 @@
 
 		return this.rpath;
 	}
-
-	/*/
-	public bool application {
-		get {
-			foreach ( string path in this.files ) {
-				if ( path.has_prefix ( ".vapi" ) )
-					return true;
-			}
-			return false;
-		}
-	}
-*/
-	// remove!
-	public bool to_doc ( string name ) {
-		if ( with_deps == true )
-			return true;
-
-		// FIXME: Compare with full path
-		string nstr = Path.get_basename ( name ) ;
-
-		foreach ( string str in this.files ) {
-			if ( Path.get_basename ( str ) == nstr )
-				return true;
-		}
-		return false;
-	}
 }
 
 

Modified: trunk/src/valadoc/valadoc.vala
==============================================================================
--- trunk/src/valadoc/valadoc.vala	(original)
+++ trunk/src/valadoc/valadoc.vala	Wed Dec 24 13:48:36 2008
@@ -56,10 +56,6 @@
 	[NoArrayLength ()]
 	private static weak string[] tpackages;
 
-	private Gee.ArrayList<string> packages = new Gee.ArrayList<string>(); // remove
-	private Gee.ArrayList<string> sources  = new Gee.ArrayList<string>(); // remove
-
-
 	private const GLib.OptionEntry[] options = {
 		{ "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, out vapi_directories,
 			"Look for package bindings in DIRECTORY", "DIRECTORY..." },
@@ -91,27 +87,6 @@
 		}
 	}
 
-/*
-	private bool check_doclet_structure ( string realpath ) {
-		bool tmp = FileUtils.test ( realpath, FileTest.IS_DIR );
-		if ( tmp == false ) {
-			return false;
-		}
-
-		tmp = FileUtils.test ( realpath + "/libdoclet.so", FileTest.IS_EXECUTABLE );
-		if ( tmp == false ) {
-			return false;
-		}
-
-
-		tmp = FileUtils.test ( realpath + "/taglets/", FileTest.IS_DIR );
-		if ( tmp == false ) {
-			return false;
-		}
-
-		return true;
-	}
-*/
 	private static bool check_pkg_name () {
 		if ( pkg_name == null )
 			return true;
@@ -144,8 +119,6 @@
 
 		settings.add_inherited = this.add_inherited;
 
-//		settings.files = this.sort_sources ( ); /// <--- remove!
-
 		settings._protected = this._protected;
 		settings.with_deps = this.with_deps;
 		settings._private = this._private;