emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* rename mu_msg_iter_is_null => mu_msg_iter_is_done

This commit is contained in:
Dirk-Jan C. Binnema 2010-09-09 00:09:00 +03:00
parent c6ebff4928
commit d1f4ebde0b
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mu-msg-iter.cc
View File

@ -88,7 +88,7 @@ mu_msg_iter_get_msg (MuMsgIter *iter)
MuMsg *msg; MuMsg *msg;
g_return_val_if_fail (iter, NULL); g_return_val_if_fail (iter, NULL);
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
path = mu_msg_iter_get_path (iter); path = mu_msg_iter_get_path (iter);
if (!path) { if (!path) {
@ -141,7 +141,9 @@ gboolean
mu_msg_iter_next (MuMsgIter *iter) mu_msg_iter_next (MuMsgIter *iter)
{ {
g_return_val_if_fail (iter, FALSE); g_return_val_if_fail (iter, FALSE);
g_return_val_if_fail (!mu_msg_iter_is_null(iter), FALSE);
if (mu_msg_iter_is_done(iter))
return FALSE;
try { try {
++iter->_offset; ++iter->_offset;
@ -172,7 +174,7 @@ mu_msg_iter_next (MuMsgIter *iter)
gboolean gboolean
mu_msg_iter_is_null (MuMsgIter *iter) mu_msg_iter_is_done (MuMsgIter *iter)
{ {
return iter ? iter->_is_null : TRUE; return iter ? iter->_is_null : TRUE;
} }
@ -182,7 +184,7 @@ const gchar*
mu_msg_iter_get_field (MuMsgIter *iter, const MuMsgField *field) mu_msg_iter_get_field (MuMsgIter *iter, const MuMsgField *field)
{ {
g_return_val_if_fail (field, NULL); g_return_val_if_fail (field, NULL);
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
try { try {
MuMsgFieldId id; MuMsgFieldId id;
@ -204,7 +206,7 @@ mu_msg_iter_get_field_numeric (MuMsgIter *iter,
const MuMsgField *field) const MuMsgField *field)
{ {
g_return_val_if_fail (field, -1); g_return_val_if_fail (field, -1);
g_return_val_if_fail (!mu_msg_iter_is_null(iter), -1); g_return_val_if_fail (!mu_msg_iter_is_done(iter), -1);
g_return_val_if_fail (mu_msg_field_is_numeric(field), -1); g_return_val_if_fail (mu_msg_field_is_numeric(field), -1);
try { try {
@ -236,7 +238,7 @@ get_field_number (MuMsgIter *iter, MuMsgFieldId id)
unsigned int unsigned int
mu_msg_iter_get_docid (MuMsgIter *iter) mu_msg_iter_get_docid (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), -1); g_return_val_if_fail (!mu_msg_iter_is_done(iter), -1);
try { try {
return iter->_cursor.get_document().get_docid(); return iter->_cursor.get_document().get_docid();
@ -247,7 +249,7 @@ mu_msg_iter_get_docid (MuMsgIter *iter)
const char* const char*
mu_msg_iter_get_path (MuMsgIter *iter) mu_msg_iter_get_path (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
return get_field (iter, MU_MSG_FIELD_ID_PATH); return get_field (iter, MU_MSG_FIELD_ID_PATH);
} }
@ -255,14 +257,14 @@ mu_msg_iter_get_path (MuMsgIter *iter)
const char* const char*
mu_msg_iter_get_from (MuMsgIter *iter) mu_msg_iter_get_from (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
return get_field (iter, MU_MSG_FIELD_ID_FROM); return get_field (iter, MU_MSG_FIELD_ID_FROM);
} }
const char* const char*
mu_msg_iter_get_to (MuMsgIter *iter) mu_msg_iter_get_to (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
return get_field (iter, MU_MSG_FIELD_ID_TO); return get_field (iter, MU_MSG_FIELD_ID_TO);
} }
@ -270,7 +272,7 @@ mu_msg_iter_get_to (MuMsgIter *iter)
const char* const char*
mu_msg_iter_get_cc (MuMsgIter *iter) mu_msg_iter_get_cc (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
return get_field (iter, MU_MSG_FIELD_ID_CC); return get_field (iter, MU_MSG_FIELD_ID_CC);
} }
@ -278,7 +280,7 @@ mu_msg_iter_get_cc (MuMsgIter *iter)
const char* const char*
mu_msg_iter_get_subject (MuMsgIter *iter) mu_msg_iter_get_subject (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
return get_field (iter, MU_MSG_FIELD_ID_SUBJECT); return get_field (iter, MU_MSG_FIELD_ID_SUBJECT);
} }
@ -286,7 +288,7 @@ mu_msg_iter_get_subject (MuMsgIter *iter)
size_t size_t
mu_msg_iter_get_size (MuMsgIter *iter) mu_msg_iter_get_size (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), 0); g_return_val_if_fail (!mu_msg_iter_is_done(iter), 0);
return static_cast<size_t>(get_field_number (iter, MU_MSG_FIELD_ID_SIZE)); return static_cast<size_t>(get_field_number (iter, MU_MSG_FIELD_ID_SIZE));
} }
@ -294,15 +296,15 @@ mu_msg_iter_get_size (MuMsgIter *iter)
time_t time_t
mu_msg_iter_get_date (MuMsgIter *iter) mu_msg_iter_get_date (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), 0); g_return_val_if_fail (!mu_msg_iter_is_done(iter), 0);
return static_cast<size_t> (get_field_number (iter, MU_MSG_FIELD_ID_DATE)); return static_cast<size_t>(get_field_number (iter, MU_MSG_FIELD_ID_DATE));
} }
MuMsgFlags MuMsgFlags
mu_msg_iter_get_flags (MuMsgIter *iter) mu_msg_iter_get_flags (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), MU_MSG_FLAG_NONE); g_return_val_if_fail (!mu_msg_iter_is_done(iter), MU_MSG_FLAG_NONE);
return static_cast<MuMsgFlags> return static_cast<MuMsgFlags>
(get_field_number (iter, MU_MSG_FIELD_ID_FLAGS)); (get_field_number (iter, MU_MSG_FIELD_ID_FLAGS));
} }
@ -310,6 +312,6 @@ mu_msg_iter_get_flags (MuMsgIter *iter)
MuMsgPrio MuMsgPrio
mu_msg_iter_get_prio (MuMsgIter *iter) mu_msg_iter_get_prio (MuMsgIter *iter)
{ {
g_return_val_if_fail (!mu_msg_iter_is_null(iter), MU_MSG_PRIO_NONE); g_return_val_if_fail (!mu_msg_iter_is_done(iter), MU_MSG_PRIO_NONE);
return static_cast<MuMsgPrio>(get_field_number (iter, MU_MSG_FIELD_ID_PRIO)); return static_cast<MuMsgPrio>(get_field_number (iter, MU_MSG_FIELD_ID_PRIO));
} }

7
src/mu-msg-iter.h
View File

@ -40,13 +40,14 @@ gboolean mu_msg_iter_next (MuMsgIter *iter);
/** /**
* does the iter point to a real message? * does this iterator point past the end of the list?
* *
* @param iter a valid MuMsgIter iterator * @param iter a valid MuMsgIter iterator
* *
* @return TRUE if the iterator points to a message, FALSE other * @return TRUE if the iter points past end of the list, FALSE
* otherwise
*/ */
gboolean mu_msg_iter_is_null (MuMsgIter *iter); gboolean mu_msg_iter_is_done (MuMsgIter *iter);
/** /**