[vala] glib-2.0: Deprecate string.size () in favor of string.length

[Jürg Billeter <juergbi src gnome org>]

commit c4013213452b5ade92a05958cda0828a0a40d7fa
Author: Jürg Billeter <j bitron ch>
Date:   Fri Aug 20 21:01:38 2010 +0200

    glib-2.0: Deprecate string.size () in favor of string.length

 ccode/valaccodeconstant.vala |    2 +-
 vala/valagenieparser.vala    |    2 +-
 vala/valagirparser.vala      |    6 +++---
 vala/valaintegerliteral.vala |    4 ++--
 vapi/glib-2.0.vapi           |   13 +++++++------
 vapigen/valagidlparser.vala  |   12 ++++++------
 vapigen/valavapicheck.vala   |    2 +-
 7 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/ccode/valaccodeconstant.vala b/ccode/valaccodeconstant.vala
index 0ac49ec..85e63c7 100644
--- a/ccode/valaccodeconstant.vala
+++ b/ccode/valaccodeconstant.vala
@@ -48,7 +48,7 @@ public class Vala.CCodeConstant : CCodeExpression {
 		var builder = new StringBuilder ("\"");
 
 		char* p = _name;
-		char* end = p + _name.size ();
+		char* end = p + _name.length;
 
 		// remove quotes
 		p++;
diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index 415a9fe..3ae29c7 100644
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -826,7 +826,7 @@ public class Vala.Genie.Parser : CodeVisitor {
 						
 						if (p_expr is StringLiteral) {
 							var s_exp = (StringLiteral) p_expr;
-							var len = s_exp.value.size ();
+							var len = s_exp.value.length;
 							
 							if (len > 2) {
 								string s = "\\n\"";
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 2ea8ee4..4ddfab7 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -309,17 +309,17 @@ public class Vala.GirParser : CodeVisitor {
 			common_prefix = cname;
 			while (common_prefix.length > 0 && !common_prefix.has_suffix ("_")) {
 				// FIXME: could easily be made faster
-				common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+				common_prefix = common_prefix.ndup (common_prefix.length - 1);
 			}
 		} else {
 			while (!cname.has_prefix (common_prefix)) {
-				common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+				common_prefix = common_prefix.ndup (common_prefix.length - 1);
 			}
 		}
 		while (common_prefix.length > 0 && (!common_prefix.has_suffix ("_") ||
 		       (cname.offset (common_prefix.length).get_char ().isdigit ()) && (cname.length - common_prefix.length) <= 1)) {
 			// enum values may not consist solely of digits
-			common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+			common_prefix = common_prefix.ndup (common_prefix.length - 1);
 		}
 	}
 
diff --git a/vala/valaintegerliteral.vala b/vala/valaintegerliteral.vala
index 297eb3e..b80fc9d 100644
--- a/vala/valaintegerliteral.vala
+++ b/vala/valaintegerliteral.vala
@@ -69,13 +69,13 @@ public class Vala.IntegerLiteral : Literal {
 		int l = 0;
 		while (value.has_suffix ("l") || value.has_suffix ("L")) {
 			l++;
-			value = value.ndup (value.size () - 1);
+			value = value.ndup (value.length - 1);
 		}
 
 		bool u = false;
 		if (value.has_suffix ("u") || value.has_suffix ("U")) {
 			u = true;
-			value = value.ndup (value.size () - 1);
+			value = value.ndup (value.length - 1);
 		}
 		
 		int64 n = value.to_int64 ();
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 851cfc1..15ab536 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1064,6 +1064,7 @@ public class string {
 		}
 	}
 
+	[Deprecated (replacement = "string.length")]
 	[CCode (cname = "strlen")]
 	public size_t size ();
 
@@ -1133,10 +1134,10 @@ public class string {
 		if (str == null) {
 			str_size = 0;
 		} else {
-			str_size = str.size ();
+			str_size = str.length;
 		}
 
-		string* result = GLib.malloc0 (this.size () - ((char*) end_string - (char*) start_string) + str_size + 1);
+		string* result = GLib.malloc0 (this.length - ((char*) end_string - (char*) start_string) + str_size + 1);
 
 		char* dest = (char*) result;
 
@@ -1146,7 +1147,7 @@ public class string {
 		GLib.Memory.copy (dest, str, str_size);
 		dest += str_size;
 
-		GLib.Memory.copy (dest, end_string, end_string.size ());
+		GLib.Memory.copy (dest, end_string, end_string.length);
 
 		return (owned) result;
 	}
@@ -1175,15 +1176,15 @@ public class string {
 	public uint8[] data {
 		get {
 			unowned uint8[] res = (uint8[]) this;
-			res.length = (int) this.size ();
+			res.length = (int) this.length;
 			return res;
 		}
 	}
 
 	public char[] to_utf8 () {
-		char[] result = new char[this.size () + 1];
+		char[] result = new char[this.length + 1];
 		result.length--;
-		GLib.Memory.copy (result, this, this.size ());
+		GLib.Memory.copy (result, this, this.length);
 		return result;
 	}
 
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index e9b518d..9ae5977 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -98,7 +98,7 @@ public class Vala.GIdlParser : CodeVisitor {
 	}
 	
 	private void parse_file (SourceFile source_file) {
-		string metadata_filename = "%s.metadata".printf (source_file.filename.ndup (source_file.filename.size () - ".gi".size ()));
+		string metadata_filename = "%s.metadata".printf (source_file.filename.ndup (source_file.filename.length - ".gi".length));
 
 		current_source_file = source_file;
 
@@ -1012,17 +1012,17 @@ public class Vala.GIdlParser : CodeVisitor {
 				common_prefix = value.name;
 				while (common_prefix.length > 0 && !common_prefix.has_suffix ("_")) {
 					// FIXME: could easily be made faster
-					common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+					common_prefix = common_prefix.ndup (common_prefix.length - 1);
 				}
 			} else {
 				while (!value.name.has_prefix (common_prefix)) {
-					common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+					common_prefix = common_prefix.ndup (common_prefix.length - 1);
 				}
 			}
 			while (common_prefix.length > 0 && (!common_prefix.has_suffix ("_") ||
 			       (value.name.offset (common_prefix.length).get_char ().isdigit ()) && (value.name.length - common_prefix.length) <= 1)) {
 				// enum values may not consist solely of digits
-				common_prefix = common_prefix.ndup (common_prefix.size () - 1);
+				common_prefix = common_prefix.ndup (common_prefix.length - 1);
 			}
 		}
 
@@ -2377,7 +2377,7 @@ public class Vala.GIdlParser : CodeVisitor {
 		}
 
 		GLib.SList<string> attr_list = new GLib.SList<string> ();
-		var attr = new GLib.StringBuilder.sized (attributes.size ());
+		var attr = new GLib.StringBuilder.sized (attributes.length);
 		var attributes_len = attributes.length;
 		unowned string remaining = attributes;
 		bool quoted = false, escaped = false;
@@ -2418,7 +2418,7 @@ public class Vala.GIdlParser : CodeVisitor {
 	}
 	
 	private string eval (string s) {
-		return ((s.size () >= 2) && s.has_prefix ("\"") && s.has_suffix ("\"")) ? s.offset (1).ndup (s.size () - 2) : s;
+		return ((s.length >= 2) && s.has_prefix ("\"") && s.has_suffix ("\"")) ? s.offset (1).ndup (s.length - 2) : s;
 	}
 
 	private Signal? parse_signal (IdlNodeSignal sig_node) {
diff --git a/vapigen/valavapicheck.vala b/vapigen/valavapicheck.vala
index 4a98c96..b6fa644 100644
--- a/vapigen/valavapicheck.vala
+++ b/vapigen/valavapicheck.vala
@@ -136,7 +136,7 @@ class Vala.VAPICheck : Object {
 				var tokens = line.split (" ", 2);
 				var symbol = tokens[0];
 
-				if (symbol.size () > 0 && !_symbols.contains (symbol)) {
+				if (symbol.length > 0 && !_symbols.contains (symbol)) {
 					var src = new SourceReference (metadata, lineno, 1, lineno, (int)symbol.length);
 					Report.error (src, "Symbol `%s' not found".printf (symbol));
 				}