alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/query,parser: update to use mu-message-fields

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2022-03-04 00:06:31 +02:00
parent 7c185590e4
commit 0df7a6959a
8 changed files with 229 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mu-query-matches.hh
View File

@ -73,7 +73,7 @@ class QueryResultsIterator {
QueryResultsIterator(Xapian::MSetIterator it,
size_t max_num,
MuMsgFieldId sort_field,
Message::Field::Id sort_field,
MuMsgIterFlags flags,
MatchInfo& minfo)
: it_{it}, match_info_{minfo}
@ -124,7 +124,7 @@ class QueryResultsIterator {
std::string message_id() const
{
g_return_val_if_fail(it_ != Xapian::MSetIterator::end(), "");
return document().get_value(MU_MSG_FIELD_ID_MSGID);
return document().get_value(Field::Id::MessageId);
}
/**
@ -136,7 +136,7 @@ class QueryResultsIterator {
std::string path() const
{
g_return_val_if_fail(it_ != Xapian::MSetIterator::end(), "");
return document().get_value(MU_MSG_FIELD_ID_PATH);
return document().get_value(Field::Id::Path);
}
/**
@ -149,7 +149,7 @@ class QueryResultsIterator {
std::vector<std::string> references() const
{
g_return_val_if_fail(it_ != Xapian::MSetIterator::end(), {});
return split(document().get_value(MU_MSG_FIELD_ID_REFS), ",");
return split(document().get_value(Field::Id::References), ",");
}
private: