[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-addons] plugins: GIT_SILENT: coding style (silent)
From: Laurent Montel <null () kde ! org>
Date: 2018-04-30 15:00:06
Message-ID: E1fDAHe-0007S2-Dc () code ! kde ! org
[Download RAW message or body]
Git commit 47553fa84d872fca5ec0dcb784a6c5fdabe7cdfd by Laurent Montel.
Committed on 30/04/2018 at 14:59.
Pushed by mlaurent into branch 'master'.
GIT_SILENT: coding style
M +3 -2 plugins/messageviewer/bodypartformatter/semantic/semanticmemento.cpp
M +1 -1 plugins/messageviewer/bodypartformatter/semantic/semanticmemento.h
M +10 -10 plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp
M +10 -9 plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
M +1 -1 plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
M +1 -1 plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp
https://commits.kde.org/kdepim-addons/47553fa84d872fca5ec0dcb784a6c5fdabe7cdfd
diff --git a/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.cpp \
b/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.cpp index \
8d7401cf..4d611f62 100644
--- a/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.cpp
+++ b/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.cpp
@@ -37,7 +37,7 @@ void SemanticMemento::setParsed(const KMime::ContentIndex &index)
m_parsedParts.insert(index);
}
-void SemanticMemento::setMessageDate(const QDateTime& contextDt)
+void SemanticMemento::setMessageDate(const QDateTime &contextDt)
{
m_postProc.setContextDate(contextDt);
}
@@ -84,8 +84,9 @@ void SemanticMemento::addPass(KPkPass::Pass *pass, const QByteArray \
&rawData) QByteArray SemanticMemento::rawPassData(const QString &passTypeIdentifier, \
const QString &serialNumber) const {
for (const auto &pass : m_passes) {
- if (pass.passTypeIdentifier == passTypeIdentifier && pass.serialNumber == \
serialNumber) + if (pass.passTypeIdentifier == passTypeIdentifier && \
pass.serialNumber == serialNumber) { return pass.rawData;
+ }
}
return {};
}
diff --git a/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.h \
b/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.h index \
2f4ace55..de3fe068 100644
--- a/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.h
+++ b/plugins/messageviewer/bodypartformatter/semantic/semanticmemento.h
@@ -59,7 +59,7 @@ public:
QVector<bool> expanded() const;
void toggleExpanded(int index);
- void addPass(KPkPass::Pass* pass, const QByteArray &rawData);
+ void addPass(KPkPass::Pass *pass, const QByteArray &rawData);
QByteArray rawPassData(const QString &passTypeIdentifier, const QString \
&serialNumber) const;
private:
diff --git a/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp \
b/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp index \
2c9f7c89..859fcd6e 100644
--- a/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp
+++ b/plugins/messageviewer/bodypartformatter/semantic/semanticrenderer.cpp
@@ -146,16 +146,16 @@ bool SemanticRenderer::render(const \
MimeTreeParser::MessagePartPtr &msgPart, Mes
const auto ticket = JsonLdDocument::readProperty(res, \
"reservedTicket").value<Ticket>(); std::unique_ptr<Prison::AbstractBarcode> barcode;
switch (ticket.ticketTokenType()) {
- case Ticket::AztecCode:
- barcode.reset(Prison::createBarcode(Prison::Aztec));
- barcode->setData(ticket.ticketTokenData());
- break;
- case Ticket::QRCode:
- barcode.reset(Prison::createBarcode(Prison::QRCode));
- barcode->setData(ticket.ticketTokenData());
- break;
- default:
- break;
+ case Ticket::AztecCode:
+ barcode.reset(Prison::createBarcode(Prison::Aztec));
+ barcode->setData(ticket.ticketTokenData());
+ break;
+ case Ticket::QRCode:
+ barcode.reset(Prison::createBarcode(Prison::QRCode));
+ barcode->setData(ticket.ticketTokenData());
+ break;
+ default:
+ break;
}
if (barcode) {
barcode->toImage(barcode->minimumSize()); // minimumSize is only \
available after we rendered once...
diff --git a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
index 72502f82..4a44bcba 100644
--- a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.cpp
@@ -127,8 +127,8 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) \
const headerStr
+= QStringLiteral(" <tr> \n"
" <td style=\"font-size: 0.8em; padding-left: \
5px; padding-right: 24px; text-align: right; vertical-align:top; ") + borderSettings \
+ QStringLiteral("\">") + i18n(
- "From: ") + QStringLiteral("</td> \n"
- " <td style=\"")
+ "From: ") + QStringLiteral("</td> \n"
+ " <td style=\"")
+ borderSettings + QStringLiteral("\">") + fromPart + \
QStringLiteral("</td> "
\
" </tr> "); }
@@ -138,8 +138,8 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) \
const headerStr
+= QStringLiteral(" <tr> "
" <td style=\"font-size: 0.8em; text-align: \
right; vertical-align:top; padding-left: 5px; padding-right: 24px; ") + \
borderSettings + QStringLiteral("\">") + i18n(
- "To: ") + QStringLiteral("</td> "
- " <td style=\"")
+ "To: ") + QStringLiteral("</td> "
+ " <td style=\"")
+ borderSettings + QStringLiteral("\">")
+StringUtil::emailAddrAsAnchor(message->to(), \
StringUtil::DisplayFullAddress, linkColor) +QStringLiteral(" </td> "
@@ -151,8 +151,8 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) \
const headerStr
+= QStringLiteral(" <tr> "
" <td style=\"font-size: 0.8em; text-align: \
right; vertical-align:top; padding-left: 5px; padding-right: 24px; ") + \
borderSettings + QStringLiteral("\">") + i18n(
- "CC: ") + QStringLiteral("</td> "
- " <td style=\"")
+ "CC: ") + QStringLiteral("</td> "
+ " <td style=\"")
+ borderSettings + QStringLiteral("\">")
+StringUtil::emailAddrAsAnchor(message->cc(), \
StringUtil::DisplayFullAddress, linkColor) +QStringLiteral(" </td> "
@@ -164,8 +164,8 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) \
const headerStr
+= QStringLiteral(" <tr> "
" <td style=\"font-size: 0.8em; text-align: \
right; vertical-align:top; padding-left: 5px; padding-right: 24px; ") + \
borderSettings + QStringLiteral("\">") + i18n(
- "BCC: ") + QStringLiteral("</td> "
- " <td style=\"")
+ "BCC: ") + QStringLiteral("</td> "
+ " <td style=\"")
+ borderSettings + QStringLiteral("\">")
+StringUtil::emailAddrAsAnchor(message->bcc(), \
StringUtil::DisplayFullAddress, linkColor) +QStringLiteral(" </td> "
@@ -183,7 +183,8 @@ QString EnterpriseHeaderStyle::format(KMime::Message *message) \
const
\
"<div>%1</div>"
\
"</div>"
\
"</td>"
- \
"<td style='min-width: 6px; max-width: 6px; background: url(").arg(attachmentHtml()) \
+ imgpath + \
"<td style='min-width: 6px; max-width: 6px; background: url(").arg( + \
attachmentHtml()) + imgpath + QStringLiteral("right.png);'</td>"
"</tr>");
}
diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp \
b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp \
index b51d8220..251a6a11 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp
@@ -228,7 +228,7 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
headerStr.append(QStringLiteral("<tr><td \
colspan=\"2\"><div>%1</div></td></tr>").arg(attachmentHtml()));
headerStr.append(
- QStringLiteral("</table></td><td \
align=\"center\">%1</td></tr></table>\n").arg(userHTML)); + \
QStringLiteral("</table></td><td \
align=\"center\">%1</td></tr></table>\n").arg(userHTML));
headerStr += QLatin1String("</div>\n\n");
return headerStr;
diff --git a/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp \
b/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp index \
5a982823..634ac542 100644
--- a/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp
+++ b/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp
@@ -23,7 +23,7 @@
#include <kpluginfactory.h>
K_PLUGIN_CLASS_WITH_JSON(TemplateParserEmailAddressRequesterAkonadi,
- "templateparseremailaddressrequesterakonadi.json")
+ "templateparseremailaddressrequesterakonadi.json")
TemplateParserEmailAddressRequesterAkonadi::TemplateParserEmailAddressRequesterAkonadi(QWidget \
*parent, const QList<QVariant> &) : \
TemplateParser::TemplateParserEmailAddressRequesterBase(parent)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic