libvaladoc: Drop deprecated methods

diff --git a/src/libvaladoc/api/class.vala b/src/libvaladoc/api/class.vala
index 6eec1370d6cd95d8eb414a9568044222b1f3a268..071b9e4382909a8c20eacf7934bd3f5753dfc2e6 100644 (file)
--- a/src/libvaladoc/api/class.vala
+++ b/src/libvaladoc/api/class.vala
@@ -238,7 +238,7 @@ public class Valadoc.Api.Class : TypeSymbol {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                if (is_abstract) {
                        signature.append_keyword ("abstract");
                }

diff --git a/src/libvaladoc/api/constant.vala b/src/libvaladoc/api/constant.vala
index f2d2260bdaefd9a0bc190f11a054918e4a260b08..9c15fc43ca9768f93eb951d606b5957b18bc1104 100644 (file)
--- a/src/libvaladoc/api/constant.vala
+++ b/src/libvaladoc/api/constant.vala
@@ -55,7 +55,7 @@ public class Valadoc.Api.Constant : Member {
         */
        protected override Inline build_signature () {
                return new SignatureBuilder ()
-                       .append_keyword (get_accessibility_modifier ())
+                       .append_keyword (accessibility.to_string ())
                        .append_keyword ("const")
                        .append_content (constant_type.signature)
                        .append_symbol (this)

diff --git a/src/libvaladoc/api/delegate.vala b/src/libvaladoc/api/delegate.vala
index d57c80d602fbfd222b8dc7ace77a2366f27a52aa..d6b3a6c6af32af5012ca23998a6966b7b07a4b92 100644 (file)
--- a/src/libvaladoc/api/delegate.vala
+++ b/src/libvaladoc/api/delegate.vala
@@ -89,7 +89,7 @@ public class Valadoc.Api.Delegate : TypeSymbol, Callable {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                signature.append_keyword ("delegate");
                signature.append_content (return_type.signature);
                signature.append_symbol (this);

diff --git a/src/libvaladoc/api/enum.vala b/src/libvaladoc/api/enum.vala
index bbfa488155db99a235ef85036b029969bda90cdb..423f0a76d8871efeb2f80f1c62ec95e5d650d35d 100644 (file)
--- a/src/libvaladoc/api/enum.vala
+++ b/src/libvaladoc/api/enum.vala
@@ -59,7 +59,7 @@ public class Valadoc.Api.Enum : TypeSymbol {
         */
        protected override Inline build_signature () {
                return new SignatureBuilder ()
-                       .append_keyword (get_accessibility_modifier ())
+                       .append_keyword (accessibility.to_string ())
                        .append_keyword ("enum")
                        .append_symbol (this)
                        .get ();

diff --git a/src/libvaladoc/api/errordomain.vala b/src/libvaladoc/api/errordomain.vala
index 3076b289af0ab2aab5269826229223c26e45590f..9ec8075124077df22cec925335178e3cd91b5ab3 100644 (file)
--- a/src/libvaladoc/api/errordomain.vala
+++ b/src/libvaladoc/api/errordomain.vala
@@ -71,7 +71,7 @@ public class Valadoc.Api.ErrorDomain : TypeSymbol {
         */
        protected override Inline build_signature () {
                return new SignatureBuilder ()
-                       .append_keyword (get_accessibility_modifier ())
+                       .append_keyword (accessibility.to_string ())
                        .append_keyword ("errordomain")
                        .append_symbol (this)
                        .get ();

diff --git a/src/libvaladoc/api/field.vala b/src/libvaladoc/api/field.vala
index d33d289c86f02a5e33a48ece82d100f39fd0eca2..800e83d854e13e360eff14de87119aea7fcda1a4 100644 (file)
--- a/src/libvaladoc/api/field.vala
+++ b/src/libvaladoc/api/field.vala
@@ -78,7 +78,7 @@ public class Valadoc.Api.Field : Member {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                if (is_static) {
                        signature.append_keyword ("static");
                }

diff --git a/src/libvaladoc/api/interface.vala b/src/libvaladoc/api/interface.vala
index 1f3ee6baebacf7589aff0f5798f4da3e5efe5a65..cf133029ba8e6d37b3de9631ac1486fd43ae975e 100644 (file)
--- a/src/libvaladoc/api/interface.vala
+++ b/src/libvaladoc/api/interface.vala
@@ -154,7 +154,7 @@ public class Valadoc.Api.Interface : TypeSymbol {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                signature.append_keyword ("interface");
                signature.append_symbol (this);
 

diff --git a/src/libvaladoc/api/method.vala b/src/libvaladoc/api/method.vala
index d222bf0cc0553870ec4ca295a6219282a2b551f8..3ce82a5001ffb79b7baaa04b6ff79a43193c0058 100644 (file)
--- a/src/libvaladoc/api/method.vala
+++ b/src/libvaladoc/api/method.vala
@@ -174,7 +174,7 @@ public class Valadoc.Api.Method : Member, Callable {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
 
                if (!is_constructor) {
                        if (is_static) {

diff --git a/src/libvaladoc/api/namespace.vala b/src/libvaladoc/api/namespace.vala
index 85da991838b29c225cb5ea6850ad721c9050aab7..9bcb233b0392d464761da643c23187815f2cb79a 100644 (file)
--- a/src/libvaladoc/api/namespace.vala
+++ b/src/libvaladoc/api/namespace.vala
@@ -56,7 +56,7 @@ public class Valadoc.Api.Namespace : Symbol {
         */
        protected override Inline build_signature () {
                return new SignatureBuilder ()
-                       .append_keyword (get_accessibility_modifier ())
+                       .append_keyword (accessibility.to_string ())
                        .append_keyword ("namespace")
                        .append_symbol (this)
                        .get ();

diff --git a/src/libvaladoc/api/node.vala b/src/libvaladoc/api/node.vala
index 8c5345c8648f47fdcccbda5ceeff8fdcbe0c13cc..a2c856f03e4fc15abc33009b964bc1089cd97225 100644 (file)
--- a/src/libvaladoc/api/node.vala
+++ b/src/libvaladoc/api/node.vala
@@ -170,10 +170,8 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara
        public abstract bool is_browsable (Settings settings);
 
        /**
-        * The corresponding file name
+        * {@inheritDoc}
         */
-       //TODO: rm
-       [Deprecated]
        public string? get_filename () {
                if (file == null) {
                        return null;

diff --git a/src/libvaladoc/api/property.vala b/src/libvaladoc/api/property.vala
index 3b6471f191eec0e88ea031461243937e1e8a9033..81ddaa775def8a89618c9acdb1fa5f127a887b1e 100644 (file)
--- a/src/libvaladoc/api/property.vala
+++ b/src/libvaladoc/api/property.vala
@@ -140,7 +140,7 @@ public class Valadoc.Api.Property : Member {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                if (is_abstract) {
                        signature.append_keyword ("abstract");
                } else if (is_override) {

diff --git a/src/libvaladoc/api/propertyaccessor.vala b/src/libvaladoc/api/propertyaccessor.vala
index 7d41e657314920358cbc02328c91f2b74a6613f6..82e1ce475991ebea75bc90d3a203f4e728872562 100644 (file)
--- a/src/libvaladoc/api/propertyaccessor.vala
+++ b/src/libvaladoc/api/propertyaccessor.vala
@@ -103,7 +103,7 @@ public class Valadoc.Api.PropertyAccessor : Symbol {
                var signature = new SignatureBuilder ();
 
                if (!is_public) {
-                       signature.append_keyword (get_accessibility_modifier ());
+                       signature.append_keyword (accessibility.to_string ());
                }
                if (is_set || is_construct) {
                        if (is_construct) {

diff --git a/src/libvaladoc/api/signal.vala b/src/libvaladoc/api/signal.vala
index 0e21dfb812968fe8dc60d64150c8608e6397b499..95d17a02cd038824ddb3189f5dcc30deb5e80339 100644 (file)
--- a/src/libvaladoc/api/signal.vala
+++ b/src/libvaladoc/api/signal.vala
@@ -95,7 +95,7 @@ public class Valadoc.Api.Signal : Member, Callable {
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                if (is_virtual) {
                        signature.append_keyword ("virtual");
                }

diff --git a/src/libvaladoc/api/struct.vala b/src/libvaladoc/api/struct.vala
index 58d33f3d1d8d5b9abdf4a9da4c1804c8bdd69613..52bcb6b3d9f37fb0c706127f1458de036891955a 100644 (file)
--- a/src/libvaladoc/api/struct.vala
+++ b/src/libvaladoc/api/struct.vala
@@ -94,13 +94,14 @@ public class Valadoc.Api.Struct : TypeSymbol {
                visitor.visit_struct (this);
        }
 
+
        /**
         * {@inheritDoc}
         */
        protected override Inline build_signature () {
                var signature = new SignatureBuilder ();
 
-               signature.append_keyword (get_accessibility_modifier ());
+               signature.append_keyword (accessibility.to_string ());
                signature.append_keyword ("struct");
                signature.append_symbol (this);
 

diff --git a/src/libvaladoc/api/symbol.vala b/src/libvaladoc/api/symbol.vala
index 9bd09ce6876e80c38b3dad90597bcae6c19bcc86..4d48a957e99fc58b3ce851125e799a006dc1c0f2 100644 (file)
--- a/src/libvaladoc/api/symbol.vala
+++ b/src/libvaladoc/api/symbol.vala
@@ -134,14 +134,5 @@ public abstract class Valadoc.Api.Symbol : Node {
                        return accessibility == SymbolAccessibility.PRIVATE;
                }
        }
-
-       /**
-        * Returns the accessibility modifier as string
-        */
-       //TODO: rm
-       [Deprecated]
-       protected string get_accessibility_modifier () {
-               return accessibility.to_string ();
-       }
 }
 

diff --git a/src/libvaladoc/documentation/documentation.vala b/src/libvaladoc/documentation/documentation.vala
index a5e201b3172fb305d3af1005824672cf1ede89d8..6df57eaa42f49261e7c336ec15ef13e8456036c9 100644 (file)
--- a/src/libvaladoc/documentation/documentation.vala
+++ b/src/libvaladoc/documentation/documentation.vala
@@ -24,10 +24,16 @@ using Gee;
 
 public interface Valadoc.Documentation : Object {
 
+       /**
+        * The corresponding package
+        */
        public abstract Api.Package? package {
                get;
        }
 
+       /**
+        * The corresponding file name
+        */
        public abstract string? get_filename ();
 }
 

diff --git a/src/libvaladoc/documentation/wiki.vala b/src/libvaladoc/documentation/wiki.vala
index 89440b263bf940ca3795776a51de43b0a325a132..113f2f08aee8ad0bc64b000446bb535107fe66da 100644 (file)
--- a/src/libvaladoc/documentation/wiki.vala
+++ b/src/libvaladoc/documentation/wiki.vala
@@ -52,6 +52,9 @@ public class Valadoc.WikiPage : Object, Documentation {
 
        private Api.Package _package;
 
+       /**
+        * The corresponding file name
+        */
        public string? get_filename () {
                return Path.get_basename(this.path);
        }