diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-03 13:22:32 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-11-06 17:34:17 +0200 |
| commit | c73e1a20e2cd65992c06d21913a7ed99785496b8 (patch) | |
| tree | 8bcfeca69832ff0b4e8ba93fb0f06b37e6de9120 | |
| parent | deacef605aa20aed316c77bff7e77498fd5236e2 (diff) | |
Fix nullptr warning on QObject::connect()
And added couple 'static's to local functions etc while at it.
Change-Id: I7b95c08199515f53ab0300117cdd3f1d19761b3b
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: <matti.viljanen@kapsi.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
4 files changed, 14 insertions, 9 deletions
diff --git a/src/libraries/qmfclient/support/qmailnamespace.cpp b/src/libraries/qmfclient/support/qmailnamespace.cpp index e60172d2..faddea8e 100644 --- a/src/libraries/qmfclient/support/qmailnamespace.cpp +++ b/src/libraries/qmfclient/support/qmailnamespace.cpp @@ -382,7 +382,7 @@ QStringList QMail::messageIdentifiers(const QString& aStr) return result; } -QMap<QByteArray, QStringList> standardFolderTranslations() +static QMap<QByteArray, QStringList> standardFolderTranslations() { QMap<QByteArray, QStringList> folderTranslations; @@ -419,7 +419,7 @@ QMap<QByteArray, QStringList> standardFolderTranslations() return folderTranslations; } -QList<StandardFolderInfo> standardFolders() +static QList<StandardFolderInfo> standardFolders() { QList<StandardFolderInfo> standardFoldersList; @@ -435,7 +435,7 @@ QList<StandardFolderInfo> standardFolders() return standardFoldersList; } -bool detectStandardFolder(const QMailAccountId &accountId, StandardFolderInfo standardFolderInfo) +static bool detectStandardFolder(const QMailAccountId &accountId, StandardFolderInfo standardFolderInfo) { QMailFolderId folderId; QMailAccount account = QMailAccount(accountId); @@ -469,7 +469,8 @@ bool detectStandardFolder(const QMailAccountId &accountId, StandardFolderInfo st folder.setStatus(flag, true); account.setStandardFolder(standardFolder, folderId); if (!QMailStore::instance()->updateAccount(&account)) { - qCWarning(lcMailStore) << "Unable to update account" << account.id() << "to set standard folder" << QMailFolder(folderId).displayName(); + qCWarning(lcMailStore) << "Unable to update account" << account.id() + << "to set standard folder" << QMailFolder(folderId).displayName(); } QMailMessageKey folderKey(QMailMessageKey::parentFolderId(folderId)); if (!QMailStore::instance()->updateMessagesMetaData(folderKey, messageFlag, true)) { diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp index 74a9f73d..cb75f987 100644 --- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp +++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp @@ -36,6 +36,7 @@ #include "qmailstore.h" #include "qmailnamespace.h" #include "qmaillog.h" + #include <QCoreApplication> #include <QDateTime> #include <QDir> @@ -43,6 +44,7 @@ #include <QtPlugin> #include <QUrl> #include <QRandomGenerator> + #if defined(Q_OS_WIN) #include <windows.h> #include <io.h> diff --git a/src/plugins/messageservices/imap/imapstrategy.cpp b/src/plugins/messageservices/imap/imapstrategy.cpp index 1d51fac8..9588edde 100644 --- a/src/plugins/messageservices/imap/imapstrategy.cpp +++ b/src/plugins/messageservices/imap/imapstrategy.cpp @@ -746,6 +746,8 @@ void ImapCreateFolderStrategy::process(ImapStrategyContextBase *context) void ImapCreateFolderStrategy::folderCreated(ImapStrategyContextBase *context, const QString &folder, bool success) { + Q_UNUSED(folder) + if (_inProgress > 0) { _inProgress--; } @@ -761,7 +763,6 @@ void ImapCreateFolderStrategy::folderCreated(ImapStrategyContextBase *context, c } context->operationCompleted(); } - Q_UNUSED(folder) } diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp index 66294ee6..657dc74c 100644 --- a/src/tools/messageserver/servicehandler.cpp +++ b/src/tools/messageserver/servicehandler.cpp @@ -806,12 +806,13 @@ QMailMessageSink *ServiceHandler::accountSink(const QMailAccountId &accountId) c QMailMessageService *ServiceHandler::createService(const QString &name, const QMailAccountId &accountId) { QMailMessageService *service = QMailMessageServiceFactory::createService(name, accountId); - connect(service, &QMailMessageService::connectivityChanged, - this, &ServiceHandler::onConnectivityChanged); - connect(service, &QMailMessageService::availabilityChanged, - this, &ServiceHandler::onAvailabilityChanged); if (service) { + connect(service, &QMailMessageService::connectivityChanged, + this, &ServiceHandler::onConnectivityChanged); + connect(service, &QMailMessageService::availabilityChanged, + this, &ServiceHandler::onAvailabilityChanged); + // if (service->usesConcurrentActions()) { // this can be uncommented to be stricter connect(service, SIGNAL(activityChanged(QMailServiceAction::Activity, quint64)), this, SLOT(emitActivityChanged(QMailServiceAction::Activity, quint64))); |