Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ae6ce36e authored by Laurent Montel's avatar Laurent Montel 😁

GI_SILENT: coding style

parent 06eb3f0c
......@@ -353,8 +353,7 @@ void ComposerPrivate::contentJobFinished(KJob *job)
}
}
void ComposerPrivate::composeWithLateAttachments(KMime::Message *headers, KMime::Content *content, const AttachmentPart::List &parts, const std::vector<GpgME::Key> &keys,
const QStringList &recipients)
void ComposerPrivate::composeWithLateAttachments(KMime::Message *headers, KMime::Content *content, const AttachmentPart::List &parts, const std::vector<GpgME::Key> &keys, const QStringList &recipients)
{
Q_Q(Composer);
......
......@@ -646,8 +646,7 @@ struct Q_DECL_HIDDEN Kleo::KeyResolver::Private {
ContactPreferencesMap mContactPreferencesMap;
};
Kleo::KeyResolver::KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int f, int encrWarnThresholdKey, int signWarnThresholdKey, int encrWarnThresholdRootCert,
int signWarnThresholdRootCert, int encrWarnThresholdChainCert, int signWarnThresholdChainCert)
Kleo::KeyResolver::KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int f, int encrWarnThresholdKey, int signWarnThresholdKey, int encrWarnThresholdRootCert, int signWarnThresholdRootCert, int encrWarnThresholdChainCert, int signWarnThresholdChainCert)
: mEncryptToSelf(encToSelf)
, mShowApprovalDialog(showApproval)
, mOpportunisticEncyption(oppEncryption)
......
......@@ -129,8 +129,7 @@ enum Result {
class KeyResolver
{
public:
KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int format, int encrKeyNearExpiryThresholdDays, int signKeyNearExpiryThresholdDays,
int encrRootCertNearExpiryThresholdDays, int signRootCertNearExpiryThresholdDays, int encrChainCertNearExpiryThresholdDays, int signChainCertNearExpiryThresholdDays);
KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int format, int encrKeyNearExpiryThresholdDays, int signKeyNearExpiryThresholdDays, int encrRootCertNearExpiryThresholdDays, int signRootCertNearExpiryThresholdDays, int encrChainCertNearExpiryThresholdDays, int signChainCertNearExpiryThresholdDays);
~KeyResolver();
......@@ -256,8 +255,7 @@ private:
Kleo::Result resolveEncryptionKeys(bool signingRequested, bool &finalySendUnencrypted);
Kleo::Result resolveSigningKeysForEncryption();
Kleo::Result resolveSigningKeysForSigningOnly();
Kleo::Result checkKeyNearExpiry(const GpgME::Key &key, const char *dontAskAgainName, bool mine, bool sign, bool ca = false, int recurse_limit = 100,
const GpgME::Key &orig_key = GpgME::Key::null) const;
Kleo::Result checkKeyNearExpiry(const GpgME::Key &key, const char *dontAskAgainName, bool mine, bool sign, bool ca = false, int recurse_limit = 100, const GpgME::Key &orig_key = GpgME::Key::null) const;
void collapseAllSplitInfos();
void addToAllSplitInfos(const std::vector<GpgME::Key> &keys, unsigned int formats);
void addKeys(const std::vector<Item> &items, CryptoMessageFormat f);
......
......@@ -657,8 +657,7 @@ KMime::Message::Ptr MessageFactoryNG::createDeliveryReceipt()
return receipt;
}
KMime::Message::Ptr MessageFactoryNG::createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal,
const QVector<KMime::MDN::DispositionModifier> &m)
KMime::Message::Ptr MessageFactoryNG::createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal, const QVector<KMime::MDN::DispositionModifier> &m)
{
// extract where to send to:
QString receiptTo;
......
......@@ -99,8 +99,7 @@ public:
user, mail is not changed and the reply-to field is set to
the email address of the original sender.
*/
Q_REQUIRED_RESULT KMime::Message::Ptr createRedirect(const QString &toStr, const QString &ccStr = QString(), const QString &bccStr = QString(), int transportId = -1,
const QString &fcc = QString(), int identity = -1);
Q_REQUIRED_RESULT KMime::Message::Ptr createRedirect(const QString &toStr, const QString &ccStr = QString(), const QString &bccStr = QString(), int transportId = -1, const QString &fcc = QString(), int identity = -1);
Q_REQUIRED_RESULT KMime::Message::Ptr createResend();
......@@ -121,8 +120,7 @@ public:
@return The notification message or 0, if none should be sent, as well as the state of the MDN operation.
**/
Q_REQUIRED_RESULT KMime::Message::Ptr createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal = 0,
const QVector<KMime::MDN::DispositionModifier> &m = QVector<KMime::MDN::DispositionModifier>());
Q_REQUIRED_RESULT KMime::Message::Ptr createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal = 0, const QVector<KMime::MDN::DispositionModifier> &m = QVector<KMime::MDN::DispositionModifier>());
/**
* Create a new forwarded MIME digest. If the user is trying to forward multiple messages
......
......@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#include "plugineditorgrammarcustomtoolsviewinterface.h"
#include <KPIMTextEdit/RichTextComposer>
using namespace MessageComposer;
......@@ -32,17 +31,14 @@ public:
KPIMTextEdit::RichTextComposer *mEditor = nullptr;
};
PluginEditorGrammarCustomToolsViewInterface::PluginEditorGrammarCustomToolsViewInterface(QWidget *parent)
: PimCommon::CustomToolsViewInterface(parent)
, d(new PluginEditorGrammarCustomToolsViewInterfacePrivate)
{
}
PluginEditorGrammarCustomToolsViewInterface::~PluginEditorGrammarCustomToolsViewInterface()
{
}
void PluginEditorGrammarCustomToolsViewInterface::setParentWidget(QWidget *parent)
......
......@@ -64,7 +64,6 @@ public:
explicit PluginEditorGrammarCustomToolsViewInterface(QWidget *parent = nullptr);
~PluginEditorGrammarCustomToolsViewInterface();
void setParentWidget(QWidget *parent);
Q_REQUIRED_RESULT QWidget *parentWidget() const;
......
......@@ -454,15 +454,13 @@ QString emailAddrAsAnchor(const KMime::Types::Mailbox::List &mailboxList, Displa
return result;
}
QString emailAddrAsAnchor(const KMime::Headers::Generics::MailboxList *mailboxList, Display display, const QString &cssStyle, Link link, AddressMode expandable, const QString &fieldName,
int collapseNumber)
QString emailAddrAsAnchor(const KMime::Headers::Generics::MailboxList *mailboxList, Display display, const QString &cssStyle, Link link, AddressMode expandable, const QString &fieldName, int collapseNumber)
{
Q_ASSERT(mailboxList);
return emailAddrAsAnchor(mailboxList->mailboxes(), display, cssStyle, link, expandable, fieldName, collapseNumber);
}
QString emailAddrAsAnchor(const KMime::Headers::Generics::AddressList *addressList, Display display, const QString &cssStyle, Link link, AddressMode expandable, const QString &fieldName,
int collapseNumber)
QString emailAddrAsAnchor(const KMime::Headers::Generics::AddressList *addressList, Display display, const QString &cssStyle, Link link, AddressMode expandable, const QString &fieldName, int collapseNumber)
{
Q_ASSERT(addressList);
return emailAddrAsAnchor(addressList->mailboxes(), display, cssStyle, link, expandable, fieldName, collapseNumber);
......
......@@ -130,23 +130,17 @@ enum AddressMode {
* @p The number of addresses to show before collapsing the rest, if expandable is set to
* ExpandableAddresses.
*/
Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString emailAddrAsAnchor(const KMime::Headers::Generics::MailboxList *mailboxList, Display display = DisplayNameOnly,
const QString &cssStyle = QString(), Link link = ShowLink, AddressMode expandable = FullAddresses,
const QString &fieldName = QString(), int collapseNumber = 4);
Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString emailAddrAsAnchor(const KMime::Headers::Generics::MailboxList *mailboxList, Display display = DisplayNameOnly, const QString &cssStyle = QString(), Link link = ShowLink, AddressMode expandable = FullAddresses, const QString &fieldName = QString(), int collapseNumber = 4);
/**
* Same as above method, only for AddressList headers.
*/
Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString emailAddrAsAnchor(const KMime::Headers::Generics::AddressList *addressList, Display display = DisplayNameOnly,
const QString &cssStyle = QString(), Link link = ShowLink, AddressMode expandable = FullAddresses,
const QString &fieldName = QString(), int collapseNumber = 4);
Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString emailAddrAsAnchor(const KMime::Headers::Generics::AddressList *addressList, Display display = DisplayNameOnly, const QString &cssStyle = QString(), Link link = ShowLink, AddressMode expandable = FullAddresses, const QString &fieldName = QString(), int collapseNumber = 4);
/**
* Same as the above, only for Mailbox::List types.
*/
Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString emailAddrAsAnchor(const QVector<KMime::Types::Mailbox> &mailboxList, Display display = DisplayNameOnly,
const QString &cssStyle = QString(), Link link = ShowLink, AddressMode expandable = FullAddresses,
const QString &fieldName = QString(), int collapseNumber = 4);
Q_REQUIRED_RESULT MESSAGECORE_EXPORT QString emailAddrAsAnchor(const QVector<KMime::Types::Mailbox> &mailboxList, Display display = DisplayNameOnly, const QString &cssStyle = QString(), Link link = ShowLink, AddressMode expandable = FullAddresses, const QString &fieldName = QString(), int collapseNumber = 4);
/**
* Returns true if the given address is contained in the given address list.
......
......@@ -29,8 +29,7 @@ using namespace MessageList::Core;
static const int gAggregationCurrentVersion = 0x1009; // increase if you add new fields of change the meaning of some
Aggregation::Aggregation(
const QString &name, const QString &description, Grouping grouping, GroupExpandPolicy groupExpandPolicy, Threading threading, ThreadLeader threadLeader, ThreadExpandPolicy threadExpandPolicy,
FillViewStrategy fillViewStrategy, bool readOnly)
const QString &name, const QString &description, Grouping grouping, GroupExpandPolicy groupExpandPolicy, Threading threading, ThreadLeader threadLeader, ThreadExpandPolicy threadExpandPolicy, FillViewStrategy fillViewStrategy, bool readOnly)
: OptionSet(name, description, readOnly)
, mGrouping(grouping)
, mGroupExpandPolicy(groupExpandPolicy)
......
......@@ -131,8 +131,7 @@ public:
explicit Aggregation();
explicit Aggregation(const Aggregation &opt);
explicit Aggregation(
const QString &name, const QString &description, Grouping grouping, GroupExpandPolicy groupExpandPolicy, Threading threading, ThreadLeader threadLeader, ThreadExpandPolicy threadExpandPolicy,
FillViewStrategy fillViewStrategy, bool readOnly);
const QString &name, const QString &description, Grouping grouping, GroupExpandPolicy groupExpandPolicy, Threading threading, ThreadLeader threadLeader, ThreadExpandPolicy threadExpandPolicy, FillViewStrategy fillViewStrategy, bool readOnly);
static bool compareName(Aggregation *agg1, Aggregation *agg2)
{
return agg1->name() < agg2->name();
......
......@@ -544,8 +544,7 @@ void Manager::addTheme(Theme *set)
mThemes.insert(set->id(), set);
}
static Theme::Column *add_theme_simple_text_column(Theme *s, const QString &name, Theme::ContentItem::Type type, bool visibleByDefault, SortOrder::MessageSorting messageSorting, bool alignRight,
bool addGroupHeaderItem)
static Theme::Column *add_theme_simple_text_column(Theme *s, const QString &name, Theme::ContentItem::Type type, bool visibleByDefault, SortOrder::MessageSorting messageSorting, bool alignRight, bool addGroupHeaderItem)
{
Theme::Column *c = new Theme::Column();
c->setLabel(name);
......@@ -583,8 +582,7 @@ static Theme::Column *add_theme_simple_text_column(Theme *s, const QString &name
return c;
}
static Theme::Column *add_theme_simple_icon_column(Theme *s, const QString &name, const QString &pixmapName, Theme::ContentItem::Type type, bool visibleByDefault,
SortOrder::MessageSorting messageSorting)
static Theme::Column *add_theme_simple_icon_column(Theme *s, const QString &name, const QString &pixmapName, Theme::ContentItem::Type type, bool visibleByDefault, SortOrder::MessageSorting messageSorting)
{
Theme::Column *c = new Theme::Column();
c->setLabel(name);
......
......@@ -161,8 +161,7 @@ static inline void paint_right_aligned_elided_text(const QString &text, Theme::C
}
}
static inline void compute_bounding_rect_for_right_aligned_elided_text(const QString &text, Theme::ContentItem *ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir,
const QFont &font)
static inline void compute_bounding_rect_for_right_aligned_elided_text(const QString &text, Theme::ContentItem *ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font)
{
Q_UNUSED(font);
const QFontMetrics &fontMetrics = cachedFontMetrics(ci);
......@@ -201,8 +200,7 @@ static inline void paint_left_aligned_elided_text(const QString &text, Theme::Co
}
}
static inline void compute_bounding_rect_for_left_aligned_elided_text(const QString &text, Theme::ContentItem *ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir,
const QFont &font)
static inline void compute_bounding_rect_for_left_aligned_elided_text(const QString &text, Theme::ContentItem *ci, int &left, int top, int &right, QRect &outRect, Qt::LayoutDirection layoutDir, const QFont &font)
{
Q_UNUSED(font);
const QFontMetrics &fontMetrics = cachedFontMetrics(ci);
......
......@@ -349,8 +349,7 @@ public:
* like "loading..."
*/
void setCurrentFolder(
const Akonadi::Collection &fld, const QModelIndex &etmIndex, bool preferEmptyTab = false, MessageList::Core::PreSelectionMode preSelectionMode = MessageList::Core::PreSelectLastSelected,
const QString &overrideLabel = QString());
const Akonadi::Collection &fld, const QModelIndex &etmIndex, bool preferEmptyTab = false, MessageList::Core::PreSelectionMode preSelectionMode = MessageList::Core::PreSelectLastSelected, const QString &overrideLabel = QString());
void resetModelStorage();
......
......@@ -200,8 +200,7 @@ QString GrantleeHeaderFormatter::toHtml(
settings.showEmoticons);
}
QString GrantleeHeaderFormatter::toHtml(const QStringList &displayExtraHeaders, const QString &absolutPath, const QString &filename, const MessageViewer::HeaderStyle *style, KMime::Message *message,
bool isPrinting) const
QString GrantleeHeaderFormatter::toHtml(const QStringList &displayExtraHeaders, const QString &absolutPath, const QString &filename, const MessageViewer::HeaderStyle *style, KMime::Message *message, bool isPrinting) const
{
d->templateLoader->setTemplateDirs(QStringList() << absolutPath);
Grantlee::Template headerTemplate = d->engine->loadByName(filename);
......@@ -211,8 +210,7 @@ QString GrantleeHeaderFormatter::toHtml(const QStringList &displayExtraHeaders,
return format(absolutPath, headerTemplate, displayExtraHeaders, isPrinting, style, message);
}
QString GrantleeHeaderFormatter::format(const QString &absolutePath, const Grantlee::Template &headerTemplate, const QStringList &displayExtraHeaders, bool isPrinting,
const MessageViewer::HeaderStyle *style, KMime::Message *message, bool showEmoticons) const
QString GrantleeHeaderFormatter::format(const QString &absolutePath, const Grantlee::Template &headerTemplate, const QStringList &displayExtraHeaders, bool isPrinting, const MessageViewer::HeaderStyle *style, KMime::Message *message, bool showEmoticons) const
{
QVariantHash headerObject;
......
......@@ -50,11 +50,9 @@ public:
Q_REQUIRED_RESULT QString toHtml(const GrantleeHeaderFormatterSettings &settings) const;
Q_REQUIRED_RESULT QString toHtml(const QStringList &displayExtraHeaders, const QString &absolutPath, const QString &filename, const MessageViewer::HeaderStyle *style, KMime::Message *message,
bool isPrinting) const;
Q_REQUIRED_RESULT QString toHtml(const QStringList &displayExtraHeaders, const QString &absolutPath, const QString &filename, const MessageViewer::HeaderStyle *style, KMime::Message *message, bool isPrinting) const;
private:
QString format(const QString &absolutePath, const Grantlee::Template &headerTemplate, const QStringList &displayExtraHeaders, bool isPrinting, const MessageViewer::HeaderStyle *style,
KMime::Message *message, bool showEmoticons = true) const;
QString format(const QString &absolutePath, const Grantlee::Template &headerTemplate, const QStringList &displayExtraHeaders, bool isPrinting, const MessageViewer::HeaderStyle *style, KMime::Message *message, bool showEmoticons = true) const;
class Private;
Private *const d;
};
......
......@@ -61,8 +61,7 @@ typedef QSharedPointer<MimeMessagePart> MimeMessagePartPtr;
class MIMETREEPARSER_EXPORT ProcessResult
{
public:
explicit ProcessResult(NodeHelper *nodeHelper, KMMsgSignatureState inlineSignatureState = KMMsgNotSigned, KMMsgEncryptionState inlineEncryptionState = KMMsgNotEncrypted,
bool neverDisplayInline = false)
explicit ProcessResult(NodeHelper *nodeHelper, KMMsgSignatureState inlineSignatureState = KMMsgNotSigned, KMMsgEncryptionState inlineEncryptionState = KMMsgNotEncrypted, bool neverDisplayInline = false)
: mInlineSignatureState(inlineSignatureState)
, mInlineEncryptionState(inlineEncryptionState)
, mNeverDisplayInline(neverDisplayInline)
......
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