GIT_SILENT: coding style

wilder
Laurent Montel 7 years ago
parent ad0ec25613
commit d22e46a8a5
  1. 3
      agents/mailfilteragent/filtermanager.h
  2. 3
      src/configuredialog/configuresecuritypage.cpp
  3. 6
      src/editor/composer.h
  4. 11
      src/editor/kmcomposerwin.cpp
  5. 12
      src/editor/kmcomposerwin.h
  6. 4
      src/editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp
  7. 4
      src/job/fillcomposerjob.h
  8. 3
      src/job/newmessagejob.h
  9. 3
      src/job/opencomposerjob.h
  10. 3
      src/kmcommands.h
  11. 18
      src/kmkernel.cpp
  12. 19
      src/kmkernel.h
  13. 3
      src/kmmainwidget.cpp
  14. 3
      src/kmmainwidget.h
  15. 3
      src/kmreadermainwin.cpp
  16. 3
      src/kmreadermainwin.h
  17. 3
      src/util.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<MailCommon::MailFilter *> &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false,
const QString &accountId = QString());
bool process(const QList<MailCommon::MailFilter *> &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString());
/**
* For ad-hoc filters.

@ -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) {

@ -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

@ -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<KToggleAction *> 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<QAction *> 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

@ -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);

@ -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<PimCommon::CustomToolsPlugin *> lstPlugin = MessageComposer::PluginEditorGrammarManager::self()->pluginsList();
for (PimCommon::CustomToolsPlugin *plugin : lstPlugin) {
if (plugin->isEnabled()) {
MessageComposer::PluginEditorGrammarCustomToolsViewInterface *interface = static_cast<MessageComposer::PluginEditorGrammarCustomToolsViewInterface*>(plugin->createView(mActionCollection, mCustomToolsWidget));
MessageComposer::PluginEditorGrammarCustomToolsViewInterface *interface = static_cast<MessageComposer::PluginEditorGrammarCustomToolsViewInterface *>(plugin->createView(mActionCollection, mCustomToolsWidget));
mCustomToolsWidget->addCustomToolViewInterface(interface);
interface->setParentWidget(mParentWidget);
interface->setRichTextEditor(mRichTextEditor);

@ -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)

@ -29,8 +29,7 @@ struct NewMessageJobSettings
{
}
NewMessageJobSettings(const QString &to, const QString &cc, const QString &bcc, bool hidden, const QString &attachURL, const QSharedPointer<MailCommon::FolderSettings> &folder, uint identity,
const Akonadi::Collection &currentCollection)
NewMessageJobSettings(const QString &to, const QString &cc, const QString &bcc, bool hidden, const QString &attachURL, const QSharedPointer<MailCommon::FolderSettings> &folder, uint identity, const Akonadi::Collection &currentCollection)
: mTo(to)
, mCc(cc)
, mBcc(bcc)

@ -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)

@ -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;

@ -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<QUrl> &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<QUrl> &attachURLs, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity)
{
if (mailto) {
openComposer(to, cc, bcc, subj, body, 0,

@ -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<QUrl> &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<QUrl> &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();

@ -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;

@ -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);

@ -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;

@ -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();

@ -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<MailCommon::FolderSettings> &folder = QSharedPointer<MailCommon::FolderSettings>(),
const Akonadi::Collection &collection = Akonadi::Collection());
bool handleClickedURL(const QUrl &url, const QSharedPointer<MailCommon::FolderSettings> &folder = QSharedPointer<MailCommon::FolderSettings>(), const Akonadi::Collection &collection = Akonadi::Collection());
bool mailingListsHandleURL(const QList<QUrl> &lst, const QSharedPointer<MailCommon::FolderSettings> &folder, const Akonadi::Collection &collection);

Loading…
Cancel
Save