Merge branch 'omp-jb6059' into 'master'

[nemo-qml-plugin-email] Add trimmedSubject role without Re: and Fwd: prefixes....

See merge request mer-core/nemo-qml-plugin-email!79

Author: pvuorela

src/emailmessagelistmodel.cpp

@@ -64,6 +64,7 @@ EmailMessageListModel::EmailMessageListModel(QObject *parent)
     roles[MessageSizeSectionRole] = "sizeSection";
     roles[MessageFolderIdRole] = "folderId";
     roles[MessageParsedSubject] = "parsedSubject";
+    roles[MessageTrimmedSubject] = "trimmedSubject";
     roles[MessageHasCalendarCancellationRole] = "hasCalendarCancellation";
 
     m_key = key();
@@ -236,6 +237,9 @@ QVariant EmailMessageListModel::data(const QModelIndex & index, int role) const
         subject.replace(QRegExp("<\\s*img", Qt::CaseInsensitive), "<no-img");
         subject.replace(QRegExp("<\\s*a", Qt::CaseInsensitive), "<no-a");
         return subject;
+    } else if (role == MessageTrimmedSubject) {
+        QString subject = QMailMessageListModel::data(index, QMailMessageModelBase::MessageSubjectTextRole).toString();
+        return subject.replace(QRegExp(QStringLiteral("^(re:|fw:|fwd:|\\s*)*"), Qt::CaseInsensitive), QString());
     } else if (role == MessageHasCalendarCancellationRole) {
         return (messageMetaData.status() & QMailMessageMetaData::CalendarCancellation) != 0;
     }

src/emailmessagelistmodel.h

@@ -71,6 +71,7 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
         MessageSizeSectionRole,                                // returns size section (0-2)
         MessageFolderIdRole,                                   // returns parent folder id for the message
         MessageParsedSubject,                                  // returns the message subject parsed against a pre-defined regular expression
+        MessageTrimmedSubject,                                 // returns the message subject without Re: and Fwd: prefixes
         MessageHasCalendarCancellationRole,                    // returns 1 if message has a calendar cancellation, 0 otherwise
     };