diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-11 19:48:41 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-13 10:12:42 +0200 |
| commit | 574b95848431529e783b7c6c72f557c4b6dbfc7c (patch) | |
| tree | 8904e016ad5fe273fddad141afeabcfa7c7fd1c9 | |
| parent | 1c42d00b822c4f209eb33fa66134d6ac5670266e (diff) | |
Fix QMailMessageServer add/update descriptions, simplify sql key
Add/update messages had their descriptions reversed.
Simplified the sql key class by defining default nullptrs instead
of repeating in multiple ctors when not being used.
Change-Id: If218ad4d9e2aa38f1148da88542c00da0bb19513
Reviewed-by: <matti.viljanen@kapsi.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
| -rw-r--r-- | src/libraries/qmfclient/qmailmessageserver.cpp | 4 | ||||
| -rw-r--r-- | src/libraries/qmfclient/qmailstoresql_p.cpp | 54 |
2 files changed, 35 insertions, 23 deletions
diff --git a/src/libraries/qmfclient/qmailmessageserver.cpp b/src/libraries/qmfclient/qmailmessageserver.cpp index 2456310e..85824c81 100644 --- a/src/libraries/qmfclient/qmailmessageserver.cpp +++ b/src/libraries/qmfclient/qmailmessageserver.cpp @@ -724,7 +724,7 @@ void QMailMessageServer::onlineFlagMessagesAndMoveToStandardFolder(quint64 actio } /*! - Requests that the MessageServer update the list of \a messages + Requests that the MessageServer add the list of \a messages in the message store, and ensure the durability of the content of \a messages. The request has the identifier \a action. @@ -735,7 +735,7 @@ void QMailMessageServer::addMessages(quint64 action, const QMailMessageMetaDataL } /*! - Requests that the MessageServer add the list of \a messages + Requests that the MessageServer update the list of \a messages to the message store, and ensure the durability of the content of \a messages. The request has the identifier \a action. diff --git a/src/libraries/qmfclient/qmailstoresql_p.cpp b/src/libraries/qmfclient/qmailstoresql_p.cpp index 675b6c24..e27bb82e 100644 --- a/src/libraries/qmfclient/qmailstoresql_p.cpp +++ b/src/libraries/qmfclient/qmailstoresql_p.cpp @@ -88,9 +88,9 @@ class QMailStoreSql::Key }; Type m_type; - const void* m_key; - const QString* m_alias; - const QString* m_field; + const void* m_key = nullptr; + const QString* m_alias = nullptr; + const QString* m_field = nullptr; static QString s_null; @@ -118,24 +118,36 @@ class QMailStoreSql::Key const QString &key(QString*) const { return *m_alias; } public: - explicit Key(const QMailAccountKey &key, const QString &alias = QString()) : m_type(Account), m_key(&key), m_alias(&alias), m_field(0) {} - Key(const QString &field, const QMailAccountKey &key, const QString &alias = QString()) : m_type(Account), m_key(&key), m_alias(&alias), m_field(&field) {} - explicit Key(const QMailAccountSortKey &key, const QString &alias = QString()) : m_type(AccountSort), m_key(&key), m_alias(&alias), m_field(0) {} - - explicit Key(const QMailFolderKey &key, const QString &alias = QString()) : m_type(Folder), m_key(&key), m_alias(&alias), m_field(0) {} - Key(const QString &field, const QMailFolderKey &key, const QString &alias = QString()) : m_type(Folder), m_key(&key), m_alias(&alias), m_field(&field) {} - explicit Key(const QMailFolderSortKey &key, const QString &alias = QString()) : m_type(FolderSort), m_key(&key), m_alias(&alias), m_field(0) {} - - explicit Key(const QMailThreadKey &key, const QString &alias = QString()) : m_type(Thread), m_key(&key), m_alias(&alias), m_field(0) {} - Key(const QString &field, const QMailThreadKey &key, const QString &alias = QString()) : m_type(Thread), m_key(&key), m_alias(&alias), m_field(&field) {} - explicit Key(const QMailThreadSortKey &key, const QString &alias = QString()) : m_type(ThreadSort), m_key(&key), m_alias(&alias), m_field(0) {} - - - explicit Key(const QMailMessageKey &key, const QString &alias = QString()) : m_type(Message), m_key(&key), m_alias(&alias), m_field(0) {} - Key(const QString &field, const QMailMessageKey &key, const QString &alias = QString()) : m_type(Message), m_key(&key), m_alias(&alias), m_field(&field) {} - explicit Key(const QMailMessageSortKey &key, const QString &alias = QString()) : m_type(MessageSort), m_key(&key), m_alias(&alias), m_field(0) {} - - explicit Key(const QString &text) : m_type(Text), m_key(0), m_alias(&text), m_field(0) {} + Key(const QString &field, const QMailAccountKey &key, const QString &alias = QString()) + : m_type(Account), m_key(&key), m_alias(&alias), m_field(&field) {} + explicit Key(const QMailAccountKey &key, const QString &alias = QString()) + : m_type(Account), m_key(&key), m_alias(&alias) {} + explicit Key(const QMailAccountSortKey &key, const QString &alias = QString()) + : m_type(AccountSort), m_key(&key), m_alias(&alias) {} + + Key(const QString &field, const QMailFolderKey &key, const QString &alias = QString()) + : m_type(Folder), m_key(&key), m_alias(&alias), m_field(&field) {} + explicit Key(const QMailFolderKey &key, const QString &alias = QString()) + : m_type(Folder), m_key(&key), m_alias(&alias) {} + explicit Key(const QMailFolderSortKey &key, const QString &alias = QString()) + : m_type(FolderSort), m_key(&key), m_alias(&alias) {} + + Key(const QString &field, const QMailThreadKey &key, const QString &alias = QString()) + : m_type(Thread), m_key(&key), m_alias(&alias), m_field(&field) {} + explicit Key(const QMailThreadKey &key, const QString &alias = QString()) + : m_type(Thread), m_key(&key), m_alias(&alias) {} + explicit Key(const QMailThreadSortKey &key, const QString &alias = QString()) + : m_type(ThreadSort), m_key(&key), m_alias(&alias) {} + + Key(const QString &field, const QMailMessageKey &key, const QString &alias = QString()) + : m_type(Message), m_key(&key), m_alias(&alias), m_field(&field) {} + explicit Key(const QMailMessageKey &key, const QString &alias = QString()) + : m_type(Message), m_key(&key), m_alias(&alias) {} + explicit Key(const QMailMessageSortKey &key, const QString &alias = QString()) + : m_type(MessageSort), m_key(&key), m_alias(&alias) {} + + explicit Key(const QString &text) + : m_type(Text), m_alias(&text) {} template<typename KeyType> bool isType() const { return isType(reinterpret_cast<KeyType*>(0)); } |