Commit f618b51b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: coding style

parent deaef27e
Pipeline #45857 canceled with stage
......@@ -464,7 +464,6 @@ void AttachmentControllerBase::createActions()
connect(d->attachmentMenu, &QAction::triggered, this, &AttachmentControllerBase::showAddAttachmentFileDialog);
d->attachmentMenu->setPopupMode(QToolButton::DelayedPopup);
d->addAttachmentFileAction = new QAction(QIcon::fromTheme(QStringLiteral("mail-attachment")), i18n("&Attach File..."), this);
d->addAttachmentFileAction->setIconText(i18n("Attach"));
d->addContextAction = new QAction(QIcon::fromTheme(QStringLiteral("mail-attachment")),
......@@ -916,10 +915,10 @@ void AttachmentControllerBase::showAddAttachmentCompressedDirectoryDialog()
void AttachmentControllerBase::showAddAttachmentFileDialog()
{
const KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenUrlsAndEncoding(QString(),
QUrl(),
QString(),
d->wParent,
i18nc("@title:window", "Attach File"));
QUrl(),
QString(),
d->wParent,
i18nc("@title:window", "Attach File"));
if (!result.URLs.isEmpty()) {
const QString encoding = MimeTreeParser::NodeHelper::fixEncoding(result.encoding);
const int numberOfFiles(result.URLs.count());
......
......@@ -11,7 +11,6 @@
#include "job/protectedheadersjob.h"
#include "utils/util_p.h"
#include <QGpgME/Protocol>
#include <QGpgME/EncryptJob>
......@@ -258,11 +257,11 @@ void EncryptJob::process()
auto result = eJob->exec(d->keys, content, true, cipherText);
if (result.error()) {
setError(result.error().code());
setErrorText(QString::fromLocal8Bit(result.error().asString()));
emitResult();
return;
}
setError(result.error().code());
setErrorText(QString::fromLocal8Bit(result.error().asString()));
emitResult();
return;
}
d->resultContent = MessageComposer::Util::composeHeadersAndBody(d->content, cipherText, d->format, false);
emitResult();
......
......@@ -196,7 +196,6 @@ void AkonadiSender::sendOrQueueMessage(const KMime::Message::Ptr &message, Messa
qjob->addressAttribute().setFrom(KEmailAddress::extractEmailAddress(KEmailAddress::normalizeAddressesAndEncodeIdn(message->from()->asUnicodeString())));
}
MessageComposer::Util::addSendReplyForwardAction(message, qjob);
MessageCore::StringUtil::removePrivateHeaderFields(message, false);
......
......@@ -460,7 +460,7 @@ void StringUtilTest::test_parseDuplicateQueryItems()
void StringUtilTest::test_parseMAilToBug402378()
{
const QByteArray ba(QByteArrayLiteral(
"mailto:?body=infotbm.com https://www.infotbm.com/fr/routes/id=-0.624162|44.849958&type=address/datetime=20181226T143038&id=stop_area:TBT:SA:HTLEV&time_type=arrival&type=stop_area/0&subject=Votre itineraire avec TBM"));
"mailto:?body=infotbm.com https://www.infotbm.com/fr/routes/id=-0.624162|44.849958&type=address/datetime=20181226T143038&id=stop_area:TBT:SA:HTLEV&time_type=arrival&type=stop_area/0&subject=Votre itineraire avec TBM"));
QUrl urlDecoded(QUrl::fromPercentEncoding(ba));
QVector<QPair<QString, QString> > data = StringUtil::parseMailtoUrl(urlDecoded);
QCOMPARE(data.size(), 6);
......@@ -483,7 +483,7 @@ void StringUtilTest::test_parseMailToBug406208()
{
{
const QByteArray ba(QByteArrayLiteral(
"mailto:?body=http%3A%2F%2Fwww.lecourrierdelarchitecte.com%2Farticle_8428&subject=Le%20Courrier%20l'effet%20%23metoo%20%3F"));
"mailto:?body=http%3A%2F%2Fwww.lecourrierdelarchitecte.com%2Farticle_8428&subject=Le%20Courrier%20l'effet%20%23metoo%20%3F"));
QUrl urlDecoded(QUrl::fromPercentEncoding(ba));
//qDebug() << " urlDecoded" << urlDecoded.authority(QUrl::FullyDecoded);
QVector<QPair<QString, QString> > data = StringUtil::parseMailtoUrl(urlDecoded);
......@@ -496,7 +496,7 @@ void StringUtilTest::test_parseMailToBug406208()
}
{
const QByteArray ba(QByteArrayLiteral(
"mailto:?body=http%3A%2F%2Fwww.lecourrierdelarchitecte.com%2Farticle_8428%20%23%23bla&subject=Le%20Courrier%20l'effet%20%23metoo%20%3F"));
"mailto:?body=http%3A%2F%2Fwww.lecourrierdelarchitecte.com%2Farticle_8428%20%23%23bla&subject=Le%20Courrier%20l'effet%20%23metoo%20%3F"));
QUrl urlDecoded(QUrl::fromPercentEncoding(ba));
//qDebug() << " urlDecoded" << urlDecoded.authority(QUrl::FullyDecoded);
QVector<QPair<QString, QString> > data = StringUtil::parseMailtoUrl(urlDecoded);
......@@ -512,7 +512,7 @@ void StringUtilTest::test_parseMailToBug406208()
void StringUtilTest::test_parseMailToBug832795()
{
const QByteArray ba(QByteArrayLiteral(
"mailto:832795@bugs.debian.org?In-Reply-To=%3C146974194340.26747.4814466130640572267.reportbug%40portux.lan.naturalnet.de%3E&subject=Re%3A%20kmail%3A%20unescaping%20mailto%3A%20links%20broken&body=On%20Thu%2C%2028%20Jul%202016References=%3C146974194340.26747.4814466130640572267.reportbug%40portux.lan.naturalnet.de%3Ebody=On%20Thu%2C%2028%20Jul%202016%2023%3A39%3A03%20%2B0200%20Dominik%20George%20%3Cnik%40naturalnet.de%3E%20wrote%3A%0A%3E%20Package%3A%20kmail%0A%3E%20Version%3A%204%3A16.04.3-1%0A"));
"mailto:832795@bugs.debian.org?In-Reply-To=%3C146974194340.26747.4814466130640572267.reportbug%40portux.lan.naturalnet.de%3E&subject=Re%3A%20kmail%3A%20unescaping%20mailto%3A%20links%20broken&body=On%20Thu%2C%2028%20Jul%202016References=%3C146974194340.26747.4814466130640572267.reportbug%40portux.lan.naturalnet.de%3Ebody=On%20Thu%2C%2028%20Jul%202016%2023%3A39%3A03%20%2B0200%20Dominik%20George%20%3Cnik%40naturalnet.de%3E%20wrote%3A%0A%3E%20Package%3A%20kmail%0A%3E%20Version%3A%204%3A16.04.3-1%0A"));
QUrl urlDecoded(QUrl::fromPercentEncoding(ba));
QVector<QPair<QString, QString> > data = StringUtil::parseMailtoUrl(urlDecoded);
QCOMPARE(data.size(), 4);
......@@ -575,7 +575,8 @@ void StringUtilTest::test_xdgemail()
}
{
//Bug 427697
const QByteArray ba(QByteArrayLiteral("mailto:julia.lawall%40inria.fr?In-Reply-To=%3Calpine.DEB.2.22.394.2009272255220.20726@hadrien%3E&#38;Cc=Gilles.Muller%40lip6.fr%2Ccocci%40systeme.lip6.fr%2Ccorbet%40lwn.net%2Clinux-doc%40vger.kernel.org%2Clinux-kernel%40vger.kernel.org%2Cmichal.lkml%40markovi.net%2Cnicolas.palix%40imag.fr%2Csylphrenadin%40gmail.com&#38;Subject=Re%3A%20%5BCocci%5D%20%5BPATCH%201%2F2%5D%20scripts%3A%20coccicheck%3A%20Change%20default%20value%20for%09parallelism"));
const QByteArray ba(QByteArrayLiteral(
"mailto:julia.lawall%40inria.fr?In-Reply-To=%3Calpine.DEB.2.22.394.2009272255220.20726@hadrien%3E&#38;Cc=Gilles.Muller%40lip6.fr%2Ccocci%40systeme.lip6.fr%2Ccorbet%40lwn.net%2Clinux-doc%40vger.kernel.org%2Clinux-kernel%40vger.kernel.org%2Cmichal.lkml%40markovi.net%2Cnicolas.palix%40imag.fr%2Csylphrenadin%40gmail.com&#38;Subject=Re%3A%20%5BCocci%5D%20%5BPATCH%201%2F2%5D%20scripts%3A%20coccicheck%3A%20Change%20default%20value%20for%09parallelism"));
QUrl urlDecoded(QUrl::fromPercentEncoding(ba));
QVector<QPair<QString, QString> > values = StringUtil::parseMailtoUrl(urlDecoded);
QCOMPARE(values.size(), 4);
......
......@@ -56,9 +56,9 @@ Manager::Manager()
Manager::~Manager()
{
disconnect(MessageListSettings::self(), &MessageListSettings::configChanged,
this, &Manager::reloadGlobalConfiguration);
this, &Manager::reloadGlobalConfiguration);
disconnect(MessageCore::MessageCoreSettings::self(), &MessageCore::MessageCoreSettings::configChanged,
this, &Manager::reloadGlobalConfiguration);
this, &Manager::reloadGlobalConfiguration);
saveConfiguration();
removeAllAggregations();
......
......@@ -413,7 +413,7 @@ void Widget::viewDropEvent(QDropEvent *e)
QAction *moveAction = menu.addAction(
QIcon::fromTheme(QStringLiteral("edit-move"), QIcon::fromTheme(QStringLiteral("go-jump"))),
i18n("&Move Here")
);
);
QAction *copyAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18n("&Copy Here"));
menu.addSeparator();
menu.addAction(QIcon::fromTheme(QStringLiteral("dialog-cancel")), i18n("C&ancel"));
......
......@@ -60,7 +60,8 @@ void ConvertHtmlToPlainTextTest::shouldConvertToPlainText_data()
QTest::newRow("bug345360")
<< QStringLiteral(
"<html><head><title>Changes to Zoho Privacy Policy and Terms of Service</title></head><body><center><table width=\"600\" style=\"margin-top:20px;\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\"><tr><td style=\"text-align:left;\"><div id=\"_zc_default\" style=\"font-family: Arial,Helvetica,sans-serif; font-size: 12px;padding-top:0px;padding-bottom:0px\"><span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> Dear User, </span> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> We have updated our Privacy Policy and Terms of Service. Please take a few minutes to read and understand them. To help you understand, we have summarized the changes and provided a comparison of the current and the previous versions. </span> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> These changes will take effect on April 19, 2015.&nbsp; If you continue to use Zoho after April 19, 2015, you will be governed by the new Privacy Policy and Terms of Service. </span> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3d\" target=\"_blank\"> Revised Privacy Policy </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3f\" target=\"_blank\"> Summary of Changes to Privacy Policy </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b41\" target=\"_blank\"> Comparison </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b47\" target=\"_blank\"> Revised Terms of Service </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b45\" target=\"_blank\"> Summary of Changes to Terms of Service </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b43\" target=\"_blank\"> Comparison </a> <br> <br> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br>Thanks!<br><br></span><div><span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\">The Zoho Team&nbsp; </span> <div> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> Zoho Corporation</span> </div> <div> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> 4141 Hacienda Drive Pleasanton,&nbsp; </span> </div> <div> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> CA 94588,</span><span style=\"font-size: 13.333333px; font-family: verdana, arial, helvetica, sans-serif; background-color: rgb(255, 255, 255);\">USA </span><span style=\"font-size: 10pt;\"> </span><span data-href=\"http://zc1.maillist-manage.com/ua/optout?od=11287eca375dad&rd=189bb4a86db70a&sd=189bb4a7ed6b37&n=11699e4c206dee1\" data-target data-text-len=\"4\" data-type=\"1\" style=\"font-size: 10pt; color: rgb(255, 255, 255);\"> .</span></div></div></div><img src=\"http://zc1.maillist-manage.com/open/od11287eca375dad_rd189bb4a86db70a.gif\" height=\"1\" width=\"50\"/></td></tr></table></center></body></html>")
<< QStringLiteral("\nDear User, \n\nWe have updated our Privacy Policy and Terms of Service. Please take a few minutes to read and understand them. To help you understand, we have summarized the changes and provided a comparison of the current and the previous versions. \n\nThese changes will take effect on April 19, 2015. If you continue to use Zoho after April 19, 2015, you will be governed by the new Privacy Policy and Terms of Service. \n\n Revised Privacy Policy [1]\n Summary of Changes to Privacy Policy [2]\n Comparison [3]\n\n Revised Terms of Service [4]\n Summary of Changes to Terms of Service [5]\n Comparison [6]\n\nThanks!\n\nThe Zoho Team \nZoho Corporation \n4141 Hacienda Drive Pleasanton, \nCA 94588,USA .[7]\n\n\n--------\n[1] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3d\n[2] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3f\n[3] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b41\n[4] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b47\n[5] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b45\n[6] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b43\n[7] http://zc1.maillist-manage.com/open/od11287eca375dad_rd189bb4a86db70a.gif\n");
<< QStringLiteral(
"\nDear User, \n\nWe have updated our Privacy Policy and Terms of Service. Please take a few minutes to read and understand them. To help you understand, we have summarized the changes and provided a comparison of the current and the previous versions. \n\nThese changes will take effect on April 19, 2015. If you continue to use Zoho after April 19, 2015, you will be governed by the new Privacy Policy and Terms of Service. \n\n Revised Privacy Policy [1]\n Summary of Changes to Privacy Policy [2]\n Comparison [3]\n\n Revised Terms of Service [4]\n Summary of Changes to Terms of Service [5]\n Comparison [6]\n\nThanks!\n\nThe Zoho Team \nZoho Corporation \n4141 Hacienda Drive Pleasanton, \nCA 94588,USA .[7]\n\n\n--------\n[1] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3d\n[2] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3f\n[3] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b41\n[4] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b47\n[5] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b45\n[6] http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b43\n[7] http://zc1.maillist-manage.com/open/od11287eca375dad_rd189bb4a86db70a.gif\n");
}
void ConvertHtmlToPlainTextTest::shouldConvertToPlainText()
......
......@@ -2802,7 +2802,7 @@ bool ViewerPrivate::htmlLoadExternal() const
}
const bool loadExternal = (mHtmlLoadExternalDefaultSetting && !mHtmlLoadExtOverride)
|| (!mHtmlLoadExternalDefaultSetting && mHtmlLoadExtOverride);
|| (!mHtmlLoadExternalDefaultSetting && mHtmlLoadExtOverride);
return loadExternal;
}
......
......@@ -21,7 +21,7 @@ TestMailDndAttachment::TestMailDndAttachment(QWidget *parent)
{
auto vbox = new QVBoxLayout(this);
auto viewer = new MessageViewer::Viewer(nullptr, nullptr, new KActionCollection(
this));
this));
vbox->addWidget(viewer);
viewer->setMessage(readAndParseMail(QStringLiteral("encapsulated-with-attachment.mbox")) /*KMime::Message::Ptr(msg)*/);
viewer->setPluginName(QStringLiteral("longheaderstyleplugin"));
......
......@@ -21,7 +21,7 @@ TestMailMBoxWebEngine::TestMailMBoxWebEngine(QWidget *parent)
{
auto vbox = new QVBoxLayout(this);
auto viewer = new MessageViewer::Viewer(nullptr, nullptr, new KActionCollection(
this));
this));
vbox->addWidget(viewer);
viewer->setMessage(readAndParseMail(QStringLiteral("html.mbox")));
viewer->setPluginName(QStringLiteral("longheaderstyleplugin"));
......
......@@ -35,11 +35,11 @@ MessagePart::Ptr MultiPartSignedBodyPartFormatter::process(Interface::BodyPart &
if (node->contents().size() != 2) {
qCDebug(MIMETREEPARSER_LOG) << "mulitpart/signed must have exactly two child parts!"
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
<< endl
<< endl
#else
<< Qt::endl
<< Qt::endl
#endif
<< "processing as multipart/mixed";
<< "processing as multipart/mixed";
if (!node->contents().isEmpty()) {
return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false));
} else {
......
......@@ -12,7 +12,6 @@
#include <gpgme++/keylistresult.h>
#include <cassert>
using namespace QGpgME;
......
......@@ -12,7 +12,6 @@
#include <gpgme++/keylistresult.h>
#include <cassert>
using namespace QGpgME;
......
......@@ -1325,7 +1325,6 @@ void EncryptedMessagePart::startDecryption(KMime::Content *data)
parseInternal(tempNode, false);
}
}
}
QString EncryptedMessagePart::plaintextContent() const
......
......@@ -356,7 +356,6 @@ public:
void setMementoName(const QByteArray &name);
Q_REQUIRED_RESULT QByteArray mementoName() const;
Q_REQUIRED_RESULT QString plaintextContent() const override;
Q_REQUIRED_RESULT QString htmlContent() const override;
......
......@@ -576,15 +576,14 @@ void TemplateParserJobTest::test_makeValidHtml_data()
QTest::newRow("plain text") << QStringLiteral("Some text\n-- \nSignature")
<< QStringLiteral("<html><head></head><body>Some text\n"
"-- \nSignature<br/></body></html>");
"-- \nSignature<br/></body></html>");
QTest::newRow("existing HTML tag") << QStringLiteral("<html><body>Some text\n-- \nSignature</body></html>")
<< QStringLiteral("<html><body>Some text\n-- \nSignature</body></html>");
QTest::newRow("existing body tag, no html") << QStringLiteral("<body>Some text\n-- \nSignature</body>")
<< QStringLiteral("<html><head></head><body>Some text\n"
"-- \nSignature</body></html>");
"-- \nSignature</body></html>");
}
void TemplateParserJobTest::test_makeValidHtml()
......
......@@ -186,7 +186,7 @@ void CustomTemplates::load()
QKeySequence shortcut(t.shortcut());
auto type = static_cast<Type>(t.type());
auto item = new CustomTemplateItem(mUi->mList, *it, t.content(),
shortcut, type, t.to(), t.cC());
shortcut, type, t.to(), t.cC());
item->setText(1, *it);
item->setText(0, indexToType(type));
iconFromType(type, item);
......
......@@ -1071,9 +1071,9 @@ void TemplateParserJob::slotExtractInfoDone(const TemplateParserExtractHtmlInfoR
// OR the original mail has no HTML part.
const KMime::Content *content = d->mOrigMsg->mainBodyPart("text/html");
if (d->mQuotes == ReplyAsPlain
|| (!d->mReplyAsHtml && TemplateParserSettings::self()->replyUsingVisualFormat())
|| !TemplateParserSettings::self()->replyUsingVisualFormat()
|| (!content || !content->hasContent())) {
|| (!d->mReplyAsHtml && TemplateParserSettings::self()->replyUsingVisualFormat())
|| !TemplateParserSettings::self()->replyUsingVisualFormat()
|| (!content || !content->hasContent())) {
htmlBody.clear();
} else {
makeValidHtml(htmlBody);
......
......@@ -13,7 +13,6 @@ QTEST_MAIN(WebEngineExportPdfPageJobTest)
WebEngineExportPdfPageJobTest::WebEngineExportPdfPageJobTest(QObject *parent)
: QObject(parent)
{
}
void WebEngineExportPdfPageJobTest::shouldHaveDefaultValue()
......
......@@ -4,7 +4,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef WEBENGINEEXPORTPDFPAGEJOBTEST_H
#define WEBENGINEEXPORTPDFPAGEJOBTEST_H
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment