lib: Rename iterator functions to prepare for reverse iteration.

We rename 'has_more' to 'valid' so that it can function whether
iterating in a forward or reverse direction. We also rename
'advance' to 'move_to_next' to setup parallel naming with
the proposed functions 'move_to_first', 'move_to_last', and
'move_to_previous'.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/database.cc b/lib/database.cc
index 2b5b64df..88c85ed4 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -751,8 +751,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
 	total = notmuch_query_count_messages (query);
 
 	for (messages = notmuch_query_search_messages (query);
-	     notmuch_messages_has_more (messages);
-	     notmuch_messages_advance (messages))
+	     notmuch_messages_valid (messages);
+	     notmuch_messages_move_to_next (messages))
 	{
 	    if (do_progress_notify) {
 		progress_notify (closure, (double) count / total);
@@ -827,8 +827,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
 	char *filename;
 
 	for (messages = notmuch_query_search_messages (query);
-	     notmuch_messages_has_more (messages);
-	     notmuch_messages_advance (messages))
+	     notmuch_messages_valid (messages);
+	     notmuch_messages_move_to_next (messages))
 	{
 	    if (do_progress_notify) {
 		progress_notify (closure, (double) count / total);