Merge lp:~mhr3/dee/vala-tags into lp:dee

[Michal Hruby]

Makes ModelTag fully usable from Vala.

[Michal Hruby (mhr3)]

The new way to use ModelTag is now:

var tag = new Dee.ModelTag<string> (model);
tag[model, iter] = "weeeee";
debug ("%s", tag[model, iter]);
tag.clear (model, iter);

Note that this will now properly duplicate the string.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Nice! :-)

But - This will break libunity, no? If so please have a branch ready for libunity before we merge.

review: Needs Information

[Michal Hruby (mhr3)]

Right - here is it: https://code.launchpad.net/~mhr3/libunity/new-tag-api/+merge/87445

[Mikkel Kamstrup Erlandsen (kamstrup)]

review: Approve

=== modified file 'vapi/Dee-1.0-custom.vala'
--- vapi/Dee-1.0-custom.vala	2011-12-15 11:28:16 +0000
+++ vapi/Dee-1.0-custom.vala	2012-01-04 08:44:24 +0000
@@ -1,14 +1,28 @@
 namespace Dee {
-  
-  public struct Filter {
-    [CCode (cname = "destroy")]
-    public GLib.DestroyNotify destroy_notify;
-  }
-  
+
+	public struct Filter {
+		[CCode (cname = "destroy")]
+		public GLib.DestroyNotify destroy_notify;
+	}
+
 	[CCode (ref_function = "", unref_function = "")]
 	[Compact]
 	public class ModelIter {
 	}
+
+	[CCode (cheader_filename = "dee.h", ref_function = "", unref_function = "")]
+	[Compact]
+	public class ModelTag<G> {
+		[CCode (cname = "dee_model_register_tag", simple_generics = true)]
+		public ModelTag (Dee.Model model);
+		[CCode (cname = "dee_model_set_tag", instance_pos = 2.1)]
+		public void @set (Dee.Model model, Dee.ModelIter iter, owned G value);
+		[CCode (cname = "dee_model_get_tag", instance_pos = 2.1)]
+		public unowned G @get (Dee.Model model, Dee.ModelIter iter);
+		[CCode (cname = "dee_model_clear_tag", instance_pos = 2.1)]
+		public void clear (Dee.Model model, Dee.ModelIter iter);
+	}
+
 	public interface ResultSet {
 		[CCode (cname = "_vala_dee_result_set_iterator")]
 		public Dee.ResultSet iterator ();
 
=== modified file 'vapi/Dee-1.0.metadata'
--- vapi/Dee-1.0.metadata	2011-12-19 10:25:16 +0000
+++ vapi/Dee-1.0.metadata	2012-01-04 08:44:24 +0000
@@ -12,6 +12,10 @@
 	.prepend skip=false
 	.set skip=false
 	.set_schema skip=false
+	.register_tag skip
+	.get_tag skip
+	.set_tag skip
+	.clear_tag skip
 
 SerializableParseFunc skip=false
 Serializable
 
=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2012-01-02 15:46:25 +0000
+++ vapi/dee-1.0.vapi	2012-01-04 08:44:24 +0000
@@ -70,9 +70,17 @@
 	[Compact]
 	public class ModelIter {
 	}
-	[CCode (cheader_filename = "dee.h")]
+	[CCode (cheader_filename = "dee.h", ref_function = "", unref_function = "")]
 	[Compact]
-	public class ModelTag {
+	public class ModelTag<G> {
+		[CCode (cname = "dee_model_register_tag", simple_generics = true)]
+		public ModelTag (Dee.Model model);
+		[CCode (cname = "dee_model_clear_tag", instance_pos = 2.1)]
+		public void clear (Dee.Model model, Dee.ModelIter iter);
+		[CCode (cname = "dee_model_get_tag", instance_pos = 2.1)]
+		public unowned G @get (Dee.Model model, Dee.ModelIter iter);
+		[CCode (cname = "dee_model_set_tag", instance_pos = 2.1)]
+		public void @set (Dee.Model model, Dee.ModelIter iter, owned G value);
 	}
 	[CCode (cheader_filename = "dee.h", type_id = "dee_peer_get_type ()")]
 	public class Peer : GLib.Object {
@@ -178,7 +186,6 @@
 		public unowned Dee.ModelIter append (...);
 		public abstract unowned Dee.ModelIter append_row ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
 		public abstract void clear ();
-		public void clear_tag (Dee.ModelIter iter, Dee.ModelTag tag);
 		public void @get (Dee.ModelIter iter, ...);
 		public abstract bool get_bool (Dee.ModelIter iter, uint column);
 		public abstract unowned string get_column_schema (uint column);
@@ -196,7 +203,6 @@
 		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
 		public abstract unowned string[] get_schema ();
 		public abstract unowned string get_string (Dee.ModelIter iter, uint column);
-		public abstract void* get_tag (Dee.ModelIter iter, Dee.ModelTag tag);
 		public abstract uint8 get_uchar (Dee.ModelIter iter, uint column);
 		public abstract uint32 get_uint32 (Dee.ModelIter iter, uint column);
 		public abstract uint64 get_uint64 (Dee.ModelIter iter, uint column);
@@ -211,13 +217,11 @@
 		public unowned Dee.ModelIter prepend (...);
 		public abstract unowned Dee.ModelIter prepend_row ([CCode (array_length = false, array_null_terminated = true)] GLib.Variant[] row_members);
 		public abstract unowned Dee.ModelIter prev (Dee.ModelIter iter);
-		public abstract unowned Dee.ModelTag register_tag (GLib.DestroyNotify tag_destroy);
 		public abstract void remove (Dee.ModelIter iter);
 		public void @set (Dee.ModelIter iter, ...);
 		public abstract void set_row (Dee.ModelIter iter, [CCode (array_length = false)] GLib.Variant[] row_members);
 		public void set_schema (...);
 		public abstract void set_schema_full ([CCode (array_length_cname = "num_columns", array_length_pos = 1.1, array_length_type = "guint", array_null_terminated = true)] string[] column_schemas);
-		public abstract void set_tag (Dee.ModelIter iter, Dee.ModelTag tag, void* value);
 		public abstract void set_value (Dee.ModelIter iter, uint column, GLib.Variant value);
 		public virtual signal void row_added (Dee.ModelIter iter);
 		public virtual signal void row_changed (Dee.ModelIter iter);