[valadoc] libvaladoc: Drop deprecated methods
- From: Florian Brosch <flobrosch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valadoc] libvaladoc: Drop deprecated methods
- Date: Fri, 10 Aug 2012 21:52:46 +0000 (UTC)
commit ca0431e1944864281c2490e632c71d03a28745aa
Author: Florian Brosch <flo brosch gmail com>
Date: Fri Aug 10 02:02:24 2012 +0200
libvaladoc: Drop deprecated methods
src/libvaladoc/api/class.vala | 2 +-
src/libvaladoc/api/constant.vala | 2 +-
src/libvaladoc/api/delegate.vala | 2 +-
src/libvaladoc/api/enum.vala | 2 +-
src/libvaladoc/api/errordomain.vala | 2 +-
src/libvaladoc/api/field.vala | 2 +-
src/libvaladoc/api/interface.vala | 2 +-
src/libvaladoc/api/method.vala | 2 +-
src/libvaladoc/api/namespace.vala | 2 +-
src/libvaladoc/api/node.vala | 4 +---
src/libvaladoc/api/property.vala | 2 +-
src/libvaladoc/api/propertyaccessor.vala | 2 +-
src/libvaladoc/api/signal.vala | 2 +-
src/libvaladoc/api/struct.vala | 3 ++-
src/libvaladoc/api/symbol.vala | 9 ---------
src/libvaladoc/documentation/documentation.vala | 6 ++++++
src/libvaladoc/documentation/wiki.vala | 3 +++
17 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/src/libvaladoc/api/class.vala b/src/libvaladoc/api/class.vala
index 6eec137..071b9e4 100644
--- 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 f2d2260..9c15fc4 100644
--- 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 d57c80d..d6b3a6c 100644
--- 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 bbfa488..423f0a7 100644
--- 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 3076b28..9ec8075 100644
--- 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 d33d289..800e83d 100644
--- 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 1f3ee6b..cf13302 100644
--- 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 d222bf0..3ce82a5 100644
--- 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 85da991..9bcb233 100644
--- 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 8c5345c..a2c856f 100644
--- 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 3b6471f..81ddaa7 100644
--- 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 7d41e65..82e1ce4 100644
--- 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 0e21dfb..95d17a0 100644
--- 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 58d33f3..52bcb6b 100644
--- 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 9bd09ce..4d48a95 100644
--- 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 a5e201b..6df57ea 100644
--- 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 89440b2..113f2f0 100644
--- 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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]