libvaladoc: Replace SymbolAccessibility with Vala.SymbolAccessibility

20 files changed, 23 insertions, 75 deletions

diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index c35ebfc3e..1e19d0c23 100644
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -53,7 +53,6 @@ libvaladoc_la_VALASOURCES = \
 	importer/valadocdocumentationimporterscanner.vala \
 	importer/girdocumentationimporter.vala \
 	importer/internalidregistrar.vala \
-	api/symbolaccessibility.vala \
 	api/sourcecomment.vala \
 	api/girsourcecomment.vala \
 	api/attributeargument.vala \
diff --git a/libvaladoc/api/class.vala b/libvaladoc/api/class.vala
index 47781c959..9b0b8865d 100644
--- a/libvaladoc/api/class.vala
+++ b/libvaladoc/api/class.vala
@@ -45,7 +45,7 @@ public class Valadoc.Api.Class : TypeSymbol {
 	private string? private_cname;
 	private string? cname;
 
-	public Class (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Class (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				  SourceComment? comment, string? cname, string? private_cname, string? class_macro_name,
 				  string? type_macro_name, string? is_type_macro_name, string? type_cast_macro_name,
 				  string? type_function_name, string? class_type_macro_name, string? is_class_type_macro_name,
diff --git a/libvaladoc/api/constant.vala b/libvaladoc/api/constant.vala
index d9d3f475d..fde36246f 100644
--- a/libvaladoc/api/constant.vala
+++ b/libvaladoc/api/constant.vala
@@ -37,7 +37,7 @@ public class Valadoc.Api.Constant : Member {
 		get;
 	}
 
-	public Constant (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Constant (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 					 SourceComment? comment, string? cname, Vala.Constant data)
 	{
 		base (parent, file, name, accessibility, comment, data);
diff --git a/libvaladoc/api/delegate.vala b/libvaladoc/api/delegate.vala
index d7afcb17e..28718db84 100644
--- a/libvaladoc/api/delegate.vala
+++ b/libvaladoc/api/delegate.vala
@@ -39,7 +39,7 @@ public class Valadoc.Api.Delegate : TypeSymbol, Callable {
 	}
 
 
-	public Delegate (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Delegate (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 					 SourceComment? comment, string? cname, bool is_static, Vala.Delegate data)
 	{
 		base (parent, file, name, accessibility, comment, null, null, null, null, false, data);
diff --git a/libvaladoc/api/enum.vala b/libvaladoc/api/enum.vala
index 1af6f0d8d..f78fbb487 100644
--- a/libvaladoc/api/enum.vala
+++ b/libvaladoc/api/enum.vala
@@ -30,7 +30,7 @@ public class Valadoc.Api.Enum : TypeSymbol {
 	private string cname;
 	private string? type_id;
 
-	public Enum (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Enum (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				 SourceComment? comment, string? cname, string? type_macro_name,
 				 string? type_function_name, Vala.Enum data)
 	{
diff --git a/libvaladoc/api/errordomain.vala b/libvaladoc/api/errordomain.vala
index 80b16bb7f..8e4eb480d 100644
--- a/libvaladoc/api/errordomain.vala
+++ b/libvaladoc/api/errordomain.vala
@@ -32,7 +32,7 @@ public class Valadoc.Api.ErrorDomain : TypeSymbol {
 	private string? dbus_name;
 	private string? cname;
 
-	public ErrorDomain (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public ErrorDomain (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 						SourceComment? comment, string? cname, string? quark_macro_name,
 						string? quark_function_name, string? dbus_name, Vala.ErrorDomain data)
 	{
diff --git a/libvaladoc/api/field.vala b/libvaladoc/api/field.vala
index baf58a94f..16264fbc7 100644
--- a/libvaladoc/api/field.vala
+++ b/libvaladoc/api/field.vala
@@ -29,7 +29,7 @@ using Valadoc.Content;
 public class Valadoc.Api.Field : Member {
 	private string? cname;
 
-	public Field (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Field (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				  SourceComment? comment, string? cname, bool is_static, bool is_volatile,
 				  Vala.Field data)
 	{
diff --git a/libvaladoc/api/formalparameter.vala b/libvaladoc/api/formalparameter.vala
index 6b572b211..4c3bd9e24 100644
--- a/libvaladoc/api/formalparameter.vala
+++ b/libvaladoc/api/formalparameter.vala
@@ -58,7 +58,7 @@ public class Valadoc.Api.FormalParameter : Symbol {
 
 	private Vala.ParameterDirection type;
 
-	public FormalParameter (Node parent, SourceFile file, string? name, SymbolAccessibility accessibility, Vala.ParameterDirection type, bool ellipsis, Vala.Parameter data) {
+	public FormalParameter (Node parent, SourceFile file, string? name, Vala.SymbolAccessibility accessibility, Vala.ParameterDirection type, bool ellipsis, Vala.Parameter data) {
 		base (parent, file, name, accessibility, data);
 		assert ((name == null && ellipsis) || (name != null && !ellipsis));
 
diff --git a/libvaladoc/api/interface.vala b/libvaladoc/api/interface.vala
index 7916649c3..e909d1365 100644
--- a/libvaladoc/api/interface.vala
+++ b/libvaladoc/api/interface.vala
@@ -32,7 +32,7 @@ public class Valadoc.Api.Interface : TypeSymbol {
 	private string? cname;
 	private string? type_id;
 
-	public Interface (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Interface (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 					  SourceComment? comment, string? cname, string? type_macro_name, string? is_type_macro_name,
 					  string? type_cast_macro_name, string? type_function_name, string interface_macro_name,
 					  string? dbus_name, Vala.Interface data)
diff --git a/libvaladoc/api/member.vala b/libvaladoc/api/member.vala
index a812fc0ab..86b276604 100644
--- a/libvaladoc/api/member.vala
+++ b/libvaladoc/api/member.vala
@@ -25,7 +25,7 @@
 public abstract class Valadoc.Api.Member : Symbol {
 	private SourceComment? source_comment;
 
-	public Member (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Member (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				   SourceComment? comment, Vala.Symbol data)
 	{
 		base (parent, file, name, accessibility, data);
diff --git a/libvaladoc/api/method.vala b/libvaladoc/api/method.vala
index 9c12c8f16..19d6f6442 100644
--- a/libvaladoc/api/method.vala
+++ b/libvaladoc/api/method.vala
@@ -43,7 +43,7 @@ public class Valadoc.Api.Method : Member, Callable {
 	}
 
 
-	public Method (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Method (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				   SourceComment? comment, string? cname, string? dbus_name, string? dbus_result_name,
 				   string? finish_function_cname, MethodBindingType binding_type, bool is_yields,
 				   bool is_dbus_visible, bool is_constructor, Vala.Method data)
diff --git a/libvaladoc/api/namespace.vala b/libvaladoc/api/namespace.vala
index c441782ca..b925e37bf 100644
--- a/libvaladoc/api/namespace.vala
+++ b/libvaladoc/api/namespace.vala
@@ -30,7 +30,7 @@ public class Valadoc.Api.Namespace : Symbol {
 	private SourceComment? source_comment;
 
 	public Namespace (Api.Node parent, SourceFile file, string? name, SourceComment? comment, Vala.Namespace data) {
-		base (parent, file, name, SymbolAccessibility.PUBLIC, data);
+		base (parent, file, name, Vala.SymbolAccessibility.PUBLIC, data);
 
 		this.source_comment = comment;
 	}
diff --git a/libvaladoc/api/property.vala b/libvaladoc/api/property.vala
index ad4c76405..9dd03b5da 100644
--- a/libvaladoc/api/property.vala
+++ b/libvaladoc/api/property.vala
@@ -31,7 +31,7 @@ public class Valadoc.Api.Property : Member {
 	private string? dbus_name;
 	private string? cname;
 
-	public Property (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Property (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 					 SourceComment? comment, string? cname, string? dbus_name, bool is_dbus_visible,
 					 PropertyBindingType binding_type, Vala.Property data)
 	{
diff --git a/libvaladoc/api/propertyaccessor.vala b/libvaladoc/api/propertyaccessor.vala
index 59a90bad7..c603fae00 100644
--- a/libvaladoc/api/propertyaccessor.vala
+++ b/libvaladoc/api/propertyaccessor.vala
@@ -31,7 +31,7 @@ public class Valadoc.Api.PropertyAccessor : Symbol {
 	private Ownership ownership;
 	private string? cname;
 
-	public PropertyAccessor (Property parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public PropertyAccessor (Property parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 							 string? cname, PropertyAccessorType type, Ownership ownership, Vala.PropertyAccessor data)
 	{
 		base (parent, file, name, accessibility, data);
diff --git a/libvaladoc/api/signal.vala b/libvaladoc/api/signal.vala
index 7da544bbd..e89836fcc 100644
--- a/libvaladoc/api/signal.vala
+++ b/libvaladoc/api/signal.vala
@@ -41,7 +41,7 @@ public class Valadoc.Api.Signal : Member, Callable {
 	}
 
 
-	public Signal (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Signal (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				   SourceComment? comment, string? cname, string? default_impl_cname, string? dbus_name, bool is_dbus_visible,
 				   bool is_virtual, Vala.Signal data)
 	{
diff --git a/libvaladoc/api/struct.vala b/libvaladoc/api/struct.vala
index a379b191b..a05544a42 100644
--- a/libvaladoc/api/struct.vala
+++ b/libvaladoc/api/struct.vala
@@ -34,7 +34,7 @@ public class Valadoc.Api.Struct : TypeSymbol {
 	private string? type_id;
 	private string? cname;
 
-	public Struct (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public Struct (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 				   SourceComment? comment, string? cname, string? type_macro_name,
 				   string? type_function_name, string? type_id, string? dup_function_cname,
 				   string? copy_function_cname, string? destroy_function_cname,
diff --git a/libvaladoc/api/symbol.vala b/libvaladoc/api/symbol.vala
index 3b375a330..c68270e0f 100644
--- a/libvaladoc/api/symbol.vala
+++ b/libvaladoc/api/symbol.vala
@@ -34,7 +34,7 @@ public abstract class Valadoc.Api.Symbol : Node {
 		get;
 	}
 
-	public Symbol (Node parent, SourceFile file, string? name, SymbolAccessibility accessibility,
+	public Symbol (Node parent, SourceFile file, string? name, Vala.SymbolAccessibility accessibility,
 				   Vala.Symbol data)
 	{
 		base (parent, file, name, data);
@@ -113,7 +113,7 @@ public abstract class Valadoc.Api.Symbol : Node {
 		return true;
 	}
 
-	public SymbolAccessibility accessibility {
+	public Vala.SymbolAccessibility accessibility {
 		private set;
 		get;
 	}
@@ -123,7 +123,7 @@ public abstract class Valadoc.Api.Symbol : Node {
 	 */
 	public bool is_public {
 		get {
-			return accessibility == SymbolAccessibility.PUBLIC;
+			return accessibility == Vala.SymbolAccessibility.PUBLIC;
 		}
 	}
 
@@ -132,7 +132,7 @@ public abstract class Valadoc.Api.Symbol : Node {
 	 */
 	public bool is_protected {
 		get {
-			return accessibility == SymbolAccessibility.PROTECTED;
+			return accessibility == Vala.SymbolAccessibility.PROTECTED;
 		}
 	}
 
@@ -141,7 +141,7 @@ public abstract class Valadoc.Api.Symbol : Node {
 	 */
 	public bool is_internal {
 		get {
-			return accessibility == SymbolAccessibility.INTERNAL;
+			return accessibility == Vala.SymbolAccessibility.INTERNAL;
 		}
 	}
 
@@ -150,7 +150,7 @@ public abstract class Valadoc.Api.Symbol : Node {
 	 */
 	public bool is_private {
 		get {
-			return accessibility == SymbolAccessibility.PRIVATE;
+			return accessibility == Vala.SymbolAccessibility.PRIVATE;
 		}
 	}
 }
diff --git a/libvaladoc/api/symbolaccessibility.vala b/libvaladoc/api/symbolaccessibility.vala
deleted file mode 100644
index 972ec2a5a..000000000
--- a/libvaladoc/api/symbolaccessibility.vala
+++ /dev/null
@@ -1,51 +0,0 @@
-/* SymbolAccessibility.vala
- *
- * Copyright (C) 2011 Florian Brosch
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- * 	Florian Brosch <flo.brosch@gmail.com>
- */
-
-
-/**
- * The access modifier
- */
-public enum Valadoc.Api.SymbolAccessibility {
-	PROTECTED,
-	INTERNAL,
-	PRIVATE,
-	PUBLIC;
-
-	public unowned string to_string () {
-		switch (this) {
-		case SymbolAccessibility.PROTECTED:
-			return "protected";
-
-		case SymbolAccessibility.INTERNAL:
-			return "internal";
-
-		case SymbolAccessibility.PRIVATE:
-			return "private";
-
-		case SymbolAccessibility.PUBLIC:
-			return "public";
-
-		default:
-			assert_not_reached ();
-		}
-	}
-}
diff --git a/libvaladoc/api/typeparameter.vala b/libvaladoc/api/typeparameter.vala
index bbeaa67c6..c2b773e7b 100644
--- a/libvaladoc/api/typeparameter.vala
+++ b/libvaladoc/api/typeparameter.vala
@@ -29,7 +29,7 @@ using Valadoc.Content;
 public class Valadoc.Api.TypeParameter : Symbol {
 
 	public TypeParameter (Node parent, SourceFile file, string name, Vala.TypeParameter data) {
-		base (parent, file, name, SymbolAccessibility.PUBLIC, data);
+		base (parent, file, name, Vala.SymbolAccessibility.PUBLIC, data);
 	}
 
 	/**
diff --git a/libvaladoc/api/typesymbol.vala b/libvaladoc/api/typesymbol.vala
index 17c3501c8..ce377585d 100644
--- a/libvaladoc/api/typesymbol.vala
+++ b/libvaladoc/api/typesymbol.vala
@@ -32,7 +32,7 @@ public abstract class Valadoc.Api.TypeSymbol : Symbol {
 	private string? type_cast_macro_name;
 	private string? type_function_name;
 
-	public TypeSymbol (Node parent, SourceFile file, string name, SymbolAccessibility accessibility,
+	public TypeSymbol (Node parent, SourceFile file, string name, Vala.SymbolAccessibility accessibility,
 					   SourceComment? comment, string? type_macro_name, string? is_type_macro_name,
 					   string? type_cast_macro_name, string? type_function_name, bool is_basic_type,
 					   Vala.TypeSymbol data)