[nemo-qml-plugin-email] Add TrimmedSubject sorting order. Contributes to JB#6059

Author: bshmarin

src/emailmessagelistmodel.cpp

@@ -239,7 +239,7 @@ QVariant EmailMessageListModel::data(const QModelIndex & index, int role) const
         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());
+        return subject.replace(QRegExp(QStringLiteral("^(re:|fw:|fwd:|\\s*|\\\")*"), Qt::CaseInsensitive), QString());
     } else if (role == MessageHasCalendarCancellationRole) {
         return (messageMetaData.status() & QMailMessageMetaData::CalendarCancellation) != 0;
     }
@@ -446,6 +446,9 @@ void EmailMessageListModel::sortByOrder(Qt::SortOrder sortOrder, EmailMessageLis
     case Subject:
         m_sortKey = QMailMessageSortKey::subject(sortOrder);
         break;
+    case TrimmedSubject:
+        m_sortKey = QMailMessageSortKey::trimmedSubject(sortOrder);
+        break;
     case Time:
         m_sortKey = QMailMessageSortKey::timeStamp(sortOrder);
         break;

src/emailmessagelistmodel.h

@@ -77,7 +77,7 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
 
     enum Priority { LowPriority, NormalPriority, HighPriority };
 
-    enum Sort { Time, Sender, Size, ReadStatus, Priority, Attachments, Subject, Recipients };
+    enum Sort { Time, Sender, Size, ReadStatus, Priority, Attachments, Subject, Recipients, TrimmedSubject };
 
     enum SearchOn { LocalAndRemote, Local, Remote };