diff options
author | Carl Worth <cworth@cworth.org> | 2010-03-09 09:22:29 -0800 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2010-03-09 09:22:29 -0800 |
commit | 4e5d2f22db290a830c0267f34b519c6138af00ed (patch) | |
tree | b75346865280153187774efb4cf38562fe912bfc /lib/thread.cc | |
parent | c5085642b8c6495ffea3d5709aa6da14cd1d8688 (diff) |
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'.
Diffstat (limited to 'lib/thread.cc')
-rw-r--r-- | lib/thread.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/thread.cc b/lib/thread.cc index 321937b0..ec80f851 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -119,8 +119,8 @@ _thread_add_message (notmuch_thread_t *thread, } for (tags = notmuch_message_get_tags (message); - notmuch_tags_has_more (tags); - notmuch_tags_advance (tags)) + notmuch_tags_valid (tags); + notmuch_tags_move_to_next (tags)) { tag = notmuch_tags_get (tags); g_hash_table_insert (thread->tags, xstrdup (tag), NULL); @@ -269,8 +269,8 @@ _notmuch_thread_create (void *ctx, notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST); for (messages = notmuch_query_search_messages (thread_id_query); - notmuch_messages_has_more (messages); - notmuch_messages_advance (messages)) + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) { message = notmuch_messages_get (messages); _thread_add_message (thread, message); @@ -280,8 +280,8 @@ _notmuch_thread_create (void *ctx, notmuch_query_destroy (thread_id_query); for (messages = notmuch_query_search_messages (matched_query); - notmuch_messages_has_more (messages); - notmuch_messages_advance (messages)) + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) { message = notmuch_messages_get (messages); _thread_add_matched_message (thread, message); |