[tracker/direct-access: 37/158] libtracker-sparql: Rename Cursor.iter_next to Cursor.next

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

commit f8d49376130d553caafadf814113d4bc2c8c6bbd
Author: Jürg Billeter <j bitron ch>
Date:   Tue Jul 13 13:47:09 2010 +0200

    libtracker-sparql: Rename Cursor.iter_next to Cursor.next

 src/libtracker-data/tracker-db-interface-sqlite.c |    2 +-
 src/libtracker-sparql/tracker-cursor.vala         |    2 +-
 tests/functional-tests/direct-test.vala           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c
index 2dc0efb..9b6c9b1 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -1081,7 +1081,7 @@ tracker_db_cursor_class_init (TrackerDBCursorClass *class)
 
 	sparql_cursor_class->get_n_columns = (gint (*) (TrackerSparqlCursor *)) tracker_db_cursor_get_n_columns;
 	sparql_cursor_class->get_string = (const gchar * (*) (TrackerSparqlCursor *, gint, gint*)) tracker_db_cursor_get_string;
-	sparql_cursor_class->iter_next = (gboolean (*) (TrackerSparqlCursor *, GError **)) tracker_db_cursor_iter_next;
+	sparql_cursor_class->next = (gboolean (*) (TrackerSparqlCursor *, GCancellable *, GError **)) tracker_db_cursor_iter_next;
 	sparql_cursor_class->rewind = (void (*) (TrackerSparqlCursor *)) tracker_db_cursor_rewind;
 }
 
diff --git a/src/libtracker-sparql/tracker-cursor.vala b/src/libtracker-sparql/tracker-cursor.vala
index 0f35a0c..bc69ba3 100644
--- a/src/libtracker-sparql/tracker-cursor.vala
+++ b/src/libtracker-sparql/tracker-cursor.vala
@@ -22,6 +22,6 @@ public abstract class Tracker.Sparql.Cursor : Object {
 	public abstract int n_columns { get; }
 	public abstract unowned string get_string (int column, out int length = null);
 
-	public abstract bool iter_next () throws GLib.Error;
+	public abstract bool next (Cancellable? cancellable = null) throws GLib.Error;
 	public abstract void rewind ();
 }
diff --git a/tests/functional-tests/direct-test.vala b/tests/functional-tests/direct-test.vala
index 36c5243..f00d8ce 100644
--- a/tests/functional-tests/direct-test.vala
+++ b/tests/functional-tests/direct-test.vala
@@ -8,7 +8,7 @@ main( string[] args )
 //	Sparql.Connection con = new Direct.Connection ();
 //	Cursor cursor = con.query ("SELECT ?u WHERE { ?u a rdfs:Class }");
 
-//	while (cursor.iter_next()) {
+//	while (cursor.next()) {
 //		int i;
 
 //		for (i = 0; i < cursor.n_columns; i++) {