diff --git a/agents/mailfilteragent/filtermanager.h b/agents/mailfilteragent/filtermanager.h index 107dae60d..4a566a48f 100644 --- a/agents/mailfilteragent/filtermanager.h +++ b/agents/mailfilteragent/filtermanager.h @@ -96,8 +96,7 @@ public: */ bool process(const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString()); - bool process(const QList &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, - const QString &accountId = QString()); + bool process(const QList &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString()); /** * For ad-hoc filters. diff --git a/src/configuredialog/configuresecuritypage.cpp b/src/configuredialog/configuresecuritypage.cpp index 75e5fceab..a4235c831 100644 --- a/src/configuredialog/configuresecuritypage.cpp +++ b/src/configuredialog/configuresecuritypage.cpp @@ -663,8 +663,7 @@ void SecurityPage::SMimeTab::save() mConfig->sync(true); } -QGpgME::CryptoConfigEntry *SMIMECryptoConfigEntries::configEntry(const QString &componentName, const QString &groupName, const QString &entryName, int /*Kleo::CryptoConfigEntry::ArgType*/ argType, - bool isList) +QGpgME::CryptoConfigEntry *SMIMECryptoConfigEntries::configEntry(const QString &componentName, const QString &groupName, const QString &entryName, int /*Kleo::CryptoConfigEntry::ArgType*/ argType, bool isList) { QGpgME::CryptoConfigEntry *entry = mConfig->entry(componentName, groupName, entryName); if (!entry) { diff --git a/src/editor/composer.h b/src/editor/composer.h index 5c03d0513..12cddb64d 100644 --- a/src/editor/composer.h +++ b/src/editor/composer.h @@ -71,8 +71,7 @@ public: // kmkernel, kmcommands, callback * Set the message the composer shall work with. This discards * previous messages without calling applyChanges() on them before. */ - virtual void setMessage(const KMime::Message::Ptr &newMsg, bool lastSignState = false, bool lastEncryptState = false, bool mayAutoSign = true, bool allowDecryption = false, - bool isModified = false) = 0; + virtual void setMessage(const KMime::Message::Ptr &newMsg, bool lastSignState = false, bool lastEncryptState = false, bool mayAutoSign = true, bool allowDecryption = false, bool isModified = false) = 0; virtual void setCurrentTransport(int transportId) = 0; virtual void setFcc(const QString &idString) = 0; @@ -131,8 +130,7 @@ public: // kmcommand }; KMAIL_EXPORT Composer *makeComposer( - const KMime::Message::Ptr &msg = KMime::Message::Ptr(), bool lastSignState = false, bool lastEncryptState = false, Composer::TemplateContext context = Composer::NoTemplate, uint identity = 0, - const QString &textSelection = QString(), const QString &customTemplate = QString()); + const KMime::Message::Ptr &msg = KMime::Message::Ptr(), bool lastSignState = false, bool lastEncryptState = false, Composer::TemplateContext context = Composer::NoTemplate, uint identity = 0, const QString &textSelection = QString(), const QString &customTemplate = QString()); } #endif // KMAIL_COMPOSER_H diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 8b4ef468d..25aa87f21 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -222,16 +222,14 @@ KMail::Composer *KMail::makeComposer(const KMime::Message::Ptr &msg, bool lastSi return KMComposerWin::create(msg, lastSignState, lastEncryptState, context, identity, textSelection, customTemplate); } -KMail::Composer *KMComposerWin::create(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, Composer::TemplateContext context, uint identity, const QString &textSelection, - const QString &customTemplate) +KMail::Composer *KMComposerWin::create(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, Composer::TemplateContext context, uint identity, const QString &textSelection, const QString &customTemplate) { return new KMComposerWin(msg, lastSignState, lastEncryptState, context, identity, textSelection, customTemplate); } int KMComposerWin::s_composerNumber = 0; -KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState, bool lastEncryptState, Composer::TemplateContext context, uint id, const QString &textSelection, - const QString &customTemplate) +KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState, bool lastEncryptState, Composer::TemplateContext context, uint id, const QString &textSelection, const QString &customTemplate) : KMail::Composer(QStringLiteral("kmail-composer#")) , mTextSelection(textSelection) , mCustomTemplate(customTemplate) @@ -446,7 +444,6 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState mPluginEditorGrammarManagerInterface->setRichTextEditor(composerEditorNg); mPluginEditorGrammarManagerInterface->setCustomToolsWidget(mCustomToolsWidget); - setupStatusBar(attachmentView->widget()); setupActions(); setupEditor(); @@ -1369,7 +1366,7 @@ void KMComposerWin::initializePluginActions() const QList customToolsWidgetActionList = mCustomToolsWidget->actionList(); qDebug() << " customToolsWidgetActionList " << customToolsWidgetActionList.count(); const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(MessageComposer::PluginActionType::Tools); - for (KToggleAction * act : customToolsWidgetActionList) { + for (KToggleAction *act : customToolsWidgetActionList) { QList lst; lst << act; if (hashActions.contains(actionlistname)) { @@ -2517,8 +2514,6 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, Me data.setNewMessage(mContext == TemplateContext::New); mPluginEditorConvertTextManagerInterface->setDataBeforeConvertingText(data); - - //TODO converttext if necessary // TODO integrate with MDA online status diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h index 5ae29702b..e163308c6 100644 --- a/src/editor/kmcomposerwin.h +++ b/src/editor/kmcomposerwin.h @@ -120,13 +120,11 @@ class KMComposerWin : public KMail::Composer friend class ::KMComposerEditor; private: // mailserviceimpl, kmkernel, kmcommands, callback, kmmainwidget - explicit KMComposerWin(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate, uint identity = 0, - const QString &textSelection = QString(), const QString &customTemplate = QString()); + explicit KMComposerWin(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate, uint identity = 0, const QString &textSelection = QString(), const QString &customTemplate = QString()); ~KMComposerWin() override; public: - static Composer *create(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate, uint identity = 0, - const QString &textSelection = QString(), const QString &customTemplate = QString()); + static Composer *create(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate, uint identity = 0, const QString &textSelection = QString(), const QString &customTemplate = QString()); QString dbusObjectPath() const override; QString smartQuote(const QString &msg); @@ -158,8 +156,7 @@ public: // kmkernel, kmcommands, callback * Set the message the composer shall work with. This discards * previous messages without calling applyChanges() on them before. */ - void setMessage(const KMime::Message::Ptr &newMsg, bool lastSignState = false, bool lastEncryptState = false, bool mayAutoSign = true, bool allowDecryption = false, - bool isModified = false) override; + void setMessage(const KMime::Message::Ptr &newMsg, bool lastSignState = false, bool lastEncryptState = false, bool mayAutoSign = true, bool allowDecryption = false, bool isModified = false) override; void setCurrentTransport(int transportId) override; @@ -499,8 +496,7 @@ private: /** * Send the message. */ - void doSend(MessageComposer::MessageSender::SendMethod method = MessageComposer::MessageSender::SendDefault, - MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone, bool willSendItWithoutReediting = false); + void doSend(MessageComposer::MessageSender::SendMethod method = MessageComposer::MessageSender::SendDefault, MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone, bool willSendItWithoutReediting = false); void doDelayedSend(MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn); diff --git a/src/editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp b/src/editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp index 48174a7ce..9afd6a1f9 100644 --- a/src/editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp +++ b/src/editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp @@ -70,7 +70,7 @@ void KMailPluginGrammarEditorManagerInterface::setCustomToolsWidget(PimCommon::C } void KMailPluginGrammarEditorManagerInterface::initializePlugins() -{ +{ if (mWasInitialized) { qCDebug(KMAIL_LOG) << "KMailPluginGrammarEditorManagerInterface : Plugin was already initialized. This is a bug"; return; @@ -90,7 +90,7 @@ void KMailPluginGrammarEditorManagerInterface::initializePlugins() const QVector lstPlugin = MessageComposer::PluginEditorGrammarManager::self()->pluginsList(); for (PimCommon::CustomToolsPlugin *plugin : lstPlugin) { if (plugin->isEnabled()) { - MessageComposer::PluginEditorGrammarCustomToolsViewInterface *interface = static_cast(plugin->createView(mActionCollection, mCustomToolsWidget)); + MessageComposer::PluginEditorGrammarCustomToolsViewInterface *interface = static_cast(plugin->createView(mActionCollection, mCustomToolsWidget)); mCustomToolsWidget->addCustomToolViewInterface(interface); interface->setParentWidget(mParentWidget); interface->setRichTextEditor(mRichTextEditor); diff --git a/src/job/fillcomposerjob.h b/src/job/fillcomposerjob.h index cb9b6e411..8da33eef7 100644 --- a/src/job/fillcomposerjob.h +++ b/src/job/fillcomposerjob.h @@ -32,9 +32,7 @@ struct FillComposerJobSettings { } - FillComposerJobSettings(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, - const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, - const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow) + FillComposerJobSettings(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow) : mTo(to) , mCc(cc) , mBcc(bcc) diff --git a/src/job/newmessagejob.h b/src/job/newmessagejob.h index 2e7324fb4..2e8588a2e 100644 --- a/src/job/newmessagejob.h +++ b/src/job/newmessagejob.h @@ -29,8 +29,7 @@ struct NewMessageJobSettings { } - NewMessageJobSettings(const QString &to, const QString &cc, const QString &bcc, bool hidden, const QString &attachURL, const QSharedPointer &folder, uint identity, - const Akonadi::Collection ¤tCollection) + NewMessageJobSettings(const QString &to, const QString &cc, const QString &bcc, bool hidden, const QString &attachURL, const QSharedPointer &folder, uint identity, const Akonadi::Collection ¤tCollection) : mTo(to) , mCc(cc) , mBcc(bcc) diff --git a/src/job/opencomposerjob.h b/src/job/opencomposerjob.h index acd244230..39f1849d3 100644 --- a/src/job/opencomposerjob.h +++ b/src/job/opencomposerjob.h @@ -30,8 +30,7 @@ struct OpenComposerSettings { } - OpenComposerSettings(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, - const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity) + OpenComposerSettings(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity) : mAttachmentPaths(attachmentPaths) , mCustomHeaders(customHeaders) , mTo(to) diff --git a/src/kmcommands.h b/src/kmcommands.h index ea6989ad8..d7dc72f5d 100644 --- a/src/kmcommands.h +++ b/src/kmcommands.h @@ -320,8 +320,7 @@ class KMReplyCommand : public KMCommand { Q_OBJECT public: - KMReplyCommand(QWidget *parent, const Akonadi::Item &msg, MessageComposer::ReplyStrategy replyStrategy, - const QString &selection = QString(), bool noquote = false, const QString &templateName = QString()); + KMReplyCommand(QWidget *parent, const Akonadi::Item &msg, MessageComposer::ReplyStrategy replyStrategy, const QString &selection = QString(), bool noquote = false, const QString &templateName = QString()); private: Result execute() override; diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp index a6cfae03e..99a0134ea 100644 --- a/src/kmkernel.cpp +++ b/src/kmkernel.cpp @@ -551,8 +551,7 @@ void KMKernel::openReader(bool onlyCheck) } } -void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, - const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity) +void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity) { const OpenComposerSettings settings(to, cc, bcc, subject, @@ -566,9 +565,7 @@ void KMKernel::openComposer(const QString &to, const QString &cc, const QString job->start(); } -void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, - const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, - const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity) +void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity) { fillComposer(hidden, to, cc, bcc, subject, body, @@ -577,9 +574,7 @@ void KMKernel::openComposer(const QString &to, const QString &cc, const QString attachContDisp, attachCharset, identity, false); } -void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, - const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, - const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity) +void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity) { fillComposer(false, to, cc, bcc, subject, body, @@ -588,9 +583,7 @@ void KMKernel::openComposer(const QString &to, const QString &cc, const QString attachContDisp, attachCharset, identity, true); } -void KMKernel::fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, - const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, - const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow) +void KMKernel::fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow) { const FillComposerJobSettings settings(hidden, to, @@ -1150,8 +1143,7 @@ void KMKernel::dumpDeadLetters() } } -void KMKernel::action(bool mailto, bool check, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, - const QList &attachURLs, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity) +void KMKernel::action(bool mailto, bool check, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList &attachURLs, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity) { if (mailto) { openComposer(to, cc, bcc, subj, body, 0, diff --git a/src/kmkernel.h b/src/kmkernel.h index d421aa7b3..efe22494f 100644 --- a/src/kmkernel.h +++ b/src/kmkernel.h @@ -179,9 +179,7 @@ public Q_SLOTS: * @param inReplyTo A list of in-reply-to headers. * @param identity The mail identity. */ - Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, - const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo = QString(), - const QString &inReplyTo = QString(), const QString &identity = QString()); + Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo = QString(), const QString &inReplyTo = QString(), const QString &identity = QString()); /** * Opens a composer window and prefills it with different @@ -204,9 +202,7 @@ public Q_SLOTS: * @param attachCharset The charset of the attachment. * @param identity The identity identifier which will be used as sender identity. */ - Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, - const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, - const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity); + Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity); /** * Opens a composer window and prefills it with different @@ -229,9 +225,7 @@ public Q_SLOTS: * @param attachCharset The charset of the attachment. * @param identity The identity identifier which will be used as sender identity. */ - Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, - const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, - const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity); + Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity); /** * Opens a composer window and prefills it with different @@ -323,8 +317,7 @@ public: bool doSessionManagement(); bool firstInstance() const; void setFirstInstance(bool value); - void action(bool mailto, bool check, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList &attach, - const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity); + void action(bool mailto, bool check, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList &attach, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity); //sets online status for akonadi accounts. true for online, false for offline void setAccountStatus(bool); @@ -481,9 +474,7 @@ private: * Fills a composer cWin * */ - void fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, - const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, - const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow); + void fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow); void verifyAccount(); void resourceGoOnLine(); diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index bb352b196..fdc77afbb 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -2663,8 +2663,7 @@ void KMMainWidget::slotContactSearchJobForMessagePopupDone(KJob *job) showMessagePopup(msg, url, imageUrl, aPoint, contactAlreadyExists, uniqueContactFound, result); } -void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, - const WebEngineViewer::WebHitTestResult &result) +void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, const WebEngineViewer::WebHitTestResult &result) { QMenu menu(this); bool urlMenuAdded = false; diff --git a/src/kmmainwidget.h b/src/kmmainwidget.h index 65469bf90..b7f8bb3fa 100644 --- a/src/kmmainwidget.h +++ b/src/kmmainwidget.h @@ -342,8 +342,7 @@ private: void openFilterDialog(const QByteArray &field, const QString &value); - void showMessagePopup(const Akonadi::Item &msg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, - const WebEngineViewer::WebHitTestResult &result); + void showMessagePopup(const Akonadi::Item &msg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, const WebEngineViewer::WebHitTestResult &result); void setZoomChanged(qreal zoomFactor); diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp index e4afe9abc..ff89e6cf6 100644 --- a/src/kmreadermainwin.cpp +++ b/src/kmreadermainwin.cpp @@ -543,8 +543,7 @@ void KMReaderMainWin::slotContactSearchJobForMessagePopupDone(KJob *job) showMessagePopup(msg, url, imageUrl, aPoint, contactAlreadyExists, uniqueContactFound, result); } -void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, - const WebEngineViewer::WebHitTestResult &result) +void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, const WebEngineViewer::WebHitTestResult &result) { QMenu *menu = nullptr; diff --git a/src/kmreadermainwin.h b/src/kmreadermainwin.h index 1773d078a..b463456ed 100644 --- a/src/kmreadermainwin.h +++ b/src/kmreadermainwin.h @@ -58,8 +58,7 @@ public: void showMessage(const QString &encoding, const Akonadi::Item &msg, const Akonadi::Collection &parentCollection = Akonadi::Collection()); void showMessage(const QString &encoding, const KMime::Message::Ptr &message); - void showMessagePopup(const Akonadi::Item &msg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, - const WebEngineViewer::WebHitTestResult &result); + void showMessagePopup(const Akonadi::Item &msg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, const WebEngineViewer::WebHitTestResult &result); public Q_SLOTS: void slotForwardInlineMsg(); void slotForwardAttachedMessage(); diff --git a/src/util.h b/src/util.h index bc408f4d8..ec1ca991b 100644 --- a/src/util.h +++ b/src/util.h @@ -64,8 +64,7 @@ Akonadi::Item::Id putRepliesInSameFolder(const Akonadi::Item &item); * Handles a clicked URL, but only in case the viewer didn't handle it. * Currently only support mailto. */ -bool handleClickedURL(const QUrl &url, const QSharedPointer &folder = QSharedPointer(), - const Akonadi::Collection &collection = Akonadi::Collection()); +bool handleClickedURL(const QUrl &url, const QSharedPointer &folder = QSharedPointer(), const Akonadi::Collection &collection = Akonadi::Collection()); bool mailingListsHandleURL(const QList &lst, const QSharedPointer &folder, const Akonadi::Collection &collection);