Commit 20dad047 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: coding style

parent 558f159c
......@@ -168,7 +168,8 @@ KContacts::Addressee::List VCardImportExportPluginInterface::parseVCard(const QB
return converter.parseVCards(data);
}
KContacts::Addressee::List VCardImportExportPluginInterface::filterContacts(const KContacts::Addressee::List &addrList, KAddressBookImportExport::KAddressBookExportSelectionWidget::ExportFields exportFieldType) const
KContacts::Addressee::List VCardImportExportPluginInterface::filterContacts(const KContacts::Addressee::List &addrList,
KAddressBookImportExport::KAddressBookExportSelectionWidget::ExportFields exportFieldType) const
{
KContacts::Addressee::List list;
......
......@@ -351,7 +351,8 @@ MergeContacts::ConflictInformations MergeContacts::requiresManualSelectionOfInfo
return result;
}
void MergeContacts::checkCustomValue(const KContacts::Addressee &address, const QString &variable, KContacts::Addressee &newContact, MergeContacts::ConflictInformations &result, MergeContacts::ConflictInformation conflict)
void MergeContacts::checkCustomValue(const KContacts::Addressee &address, const QString &variable, KContacts::Addressee &newContact, MergeContacts::ConflictInformations &result,
MergeContacts::ConflictInformation conflict)
{
const QString value = address.custom(QStringLiteral("KADDRESSBOOK"), variable);
if (!value.isEmpty()) {
......
......@@ -63,7 +63,8 @@ public:
void setItems(const Akonadi::Item::List &items);
private:
void mergeToContact(KContacts::Addressee &newAddress, const KContacts::Addressee &fromContact, bool excludeConflictPart);
void checkCustomValue(const KContacts::Addressee &address, const QString &variable, KContacts::Addressee &newContact, MergeContacts::ConflictInformations &result, MergeContacts::ConflictInformation conflict);
void checkCustomValue(const KContacts::Addressee &address, const QString &variable, KContacts::Addressee &newContact, MergeContacts::ConflictInformations &result,
MergeContacts::ConflictInformation conflict);
void mergeCustomValue(const KContacts::Addressee &fromContact, const QString &variable, KContacts::Addressee &newContact);
Akonadi::Item::List mListItem;
};
......
......@@ -23,7 +23,8 @@
#include <QPointer>
ConfirmAddressSimpleStringListEditor::ConfirmAddressSimpleStringListEditor(QWidget *parent, ButtonCode buttons, const QString &addLabel, const QString &removeLabel, const QString &modifyLabel, const QString &addDialogLabel)
ConfirmAddressSimpleStringListEditor::ConfirmAddressSimpleStringListEditor(QWidget *parent, ButtonCode buttons, const QString &addLabel, const QString &removeLabel, const QString &modifyLabel,
const QString &addDialogLabel)
: PimCommon::SimpleStringListEditor(parent, buttons, addLabel, removeLabel, modifyLabel, addDialogLabel)
{
}
......
......@@ -25,7 +25,8 @@ class ConfirmAddressSimpleStringListEditor : public PimCommon::SimpleStringListE
{
Q_OBJECT
public:
explicit ConfirmAddressSimpleStringListEditor(QWidget *parent = nullptr, ButtonCode buttons = Unsorted, const QString &addLabel = QString(), const QString &removeLabel = QString(), const QString &modifyLabel = QString(), const QString &addDialogLabel = QString());
explicit ConfirmAddressSimpleStringListEditor(QWidget *parent = nullptr, ButtonCode buttons = Unsorted, const QString &addLabel = QString(),
const QString &removeLabel = QString(), const QString &modifyLabel = QString(), const QString &addDialogLabel = QString());
void addNewEntry() override;
QString modifyEntry(const QString &text) override;
......
......@@ -690,7 +690,9 @@ void AntiSpamWizard::sortFilterOnExistance(
}
//---------------------------------------------------------------------------
AntiSpamWizard::SpamToolConfig::SpamToolConfig(const QString &toolId, int configVersion, int prio, const QString &name, const QString &exec, const QString &url, const QString &filter, const QString &detection, const QString &spam, const QString &ham, const QString &noSpam, const QString &header, const QString &pattern, const QString &pattern2, const QString &serverPattern, bool detectionOnly, bool regExp, bool bayesFilter, bool tristateDetection, WizardMode type)
AntiSpamWizard::SpamToolConfig::SpamToolConfig(const QString &toolId, int configVersion, int prio, const QString &name, const QString &exec, const QString &url, const QString &filter,
const QString &detection, const QString &spam, const QString &ham, const QString &noSpam, const QString &header, const QString &pattern,
const QString &pattern2, const QString &serverPattern, bool detectionOnly, bool regExp, bool bayesFilter, bool tristateDetection, WizardMode type)
: mId(toolId)
, mVersion(configVersion)
, mPrio(prio)
......
......@@ -135,7 +135,9 @@ protected:
{
}
SpamToolConfig(const QString &toolId, int configVersion, int prio, const QString &name, const QString &exec, const QString &url, const QString &filter, const QString &detection, const QString &spam, const QString &ham, const QString &noSpam, const QString &header, const QString &pattern, const QString &pattern2, const QString &serverPattern, bool detectionOnly, bool regExp, bool bayesFilter, bool tristateDetection, WizardMode type);
SpamToolConfig(const QString &toolId, int configVersion, int prio, const QString &name, const QString &exec, const QString &url, const QString &filter, const QString &detection,
const QString &spam, const QString &ham, const QString &noSpam, const QString &header, const QString &pattern, const QString &pattern2, const QString &serverPattern,
bool detectionOnly, bool regExp, bool bayesFilter, bool tristateDetection, WizardMode type);
int getVersion() const;
int getPrio() const;
......
......@@ -25,7 +25,8 @@ class AttachmentListWidget : public PimCommon::SimpleStringListEditor
{
Q_OBJECT
public:
explicit AttachmentListWidget(QWidget *parent = nullptr, ButtonCode buttons = Unsorted, const QString &addLabel = QString(), const QString &removeLabel = QString(), const QString &modifyLabel = QString());
explicit AttachmentListWidget(QWidget *parent = nullptr, ButtonCode buttons = Unsorted, const QString &addLabel = QString(),
const QString &removeLabel = QString(), const QString &modifyLabel = QString());
~AttachmentListWidget() override;
void addNewEntry() override;
......
......@@ -662,7 +662,8 @@ public:
return true;
}
bool mail(Viewer *viewerInstance, const Incidence::Ptr &incidence, const QString &status, iTIPMethod method = iTIPReply, const QString &receiver = QString(), const QString &to = QString(), MailType type = Answer) const
bool mail(Viewer *viewerInstance, const Incidence::Ptr &incidence, const QString &status, iTIPMethod method = iTIPReply, const QString &receiver = QString(),
const QString &to = QString(), MailType type = Answer) const
{
//status is accepted/tentative/declined
ICalFormat format;
......
......@@ -21,8 +21,7 @@
#define KDEPIMTEST_LAYOUT_H
#include <QTest>
#include <QLayout>
namespace KdepimTestLayout
{
namespace KdepimTestLayout {
void checkContentsMargins(int margin, QLayout *layout)
{
int top = -1;
......
......@@ -23,7 +23,6 @@
#include <QDialog>
#include "dkimconfigure_private_export.h"
class DKIMConfigureWidget;
class LIBDKIMVERIFYCONFIGURE_TESTS_EXPORT DKIMConfigureDialog : public QDialog
{
......
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