From 782f79aea0f3ac7f8cc94d80b45a383b537c2bfd Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 28 Jan 2015 08:08:01 +0100 Subject: [PATCH] Astyle kdelibs --- editor/kmcomposewin.cpp | 14 ++++---- .../potentialphishingdetaildialogtest.cpp | 2 +- .../potentialphishingemailjobtest.cpp | 17 +++++---- .../potentialphishingdetaildialog.cpp | 36 +++++++++---------- .../potentialphishingdetaildialog.h | 2 +- .../potentialphishingemailjob.cpp | 4 +-- .../potentialphishingemailwarning.cpp | 15 ++++---- kmkernel.cpp | 2 +- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp index 81d0506d1..d6a134dca 100644 --- a/editor/kmcomposewin.cpp +++ b/editor/kmcomposewin.cpp @@ -697,7 +697,7 @@ bool KMComposeWin::canSignEncryptAttachments() const return cryptoMessageFormat() != Kleo::InlineOpenPGPFormat; } -void KMComposeWin::slotUpdateView( void ) +void KMComposeWin::slotUpdateView(void) { if (!mDone) { return; // otherwise called from rethinkFields during the construction @@ -1915,8 +1915,8 @@ void KMComposeWin::forceAutoSaveMessage() void KMComposeWin::autoSaveMessage(bool force) { - if ( isComposerModified() || force ) { - applyComposerSetting( mComposerBase ); + if (isComposerModified() || force) { + applyComposerSetting(mComposerBase); mComposerBase->saveMailSettings(); mComposerBase->autoSaveMessage(); if (!force) { @@ -2990,15 +2990,17 @@ void KMComposeWin::slotCheckSendNowStep2() void KMComposeWin::slotCheckSendNow() { PotentialPhishingEmailJob *job = new PotentialPhishingEmailJob(this); - KConfigGroup group( KSharedConfig::openConfig(), "PotentialPhishing"); + KConfigGroup group(KSharedConfig::openConfig(), "PotentialPhishing"); const QStringList whiteList = group.readEntry("whiteList", QStringList()); job->setEmailWhiteList(whiteList); QStringList lst; lst << mComposerBase->to(); - if (!mComposerBase->cc().isEmpty()) + if (!mComposerBase->cc().isEmpty()) { lst << mComposerBase->cc().split(QLatin1Char(',')); - if (!mComposerBase->bcc().isEmpty()) + } + if (!mComposerBase->bcc().isEmpty()) { lst << mComposerBase->bcc().split(QLatin1Char(',')); + } job->setEmails(lst); connect(job, SIGNAL(potentialPhishingEmailsFound(QStringList)), this, SLOT(slotPotentialPhishingEmailsFound(QStringList))); job->start(); diff --git a/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp b/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp index 1a09fdcb3..226f6e0fd 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp @@ -84,7 +84,7 @@ void PotentialPhishingDetailDialogTest::shouldNotAddDuplicateEntries() lst << QLatin1String("blo"); lst << QLatin1String("blo"); dlg.fillList(lst); - QCOMPARE(listWidget->count(), (lst.count()-1)); + QCOMPARE(listWidget->count(), (lst.count() - 1)); } diff --git a/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp b/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp index b848f307d..e0acc3edf 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp @@ -47,19 +47,19 @@ void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails_data() QTest::addColumn("listEmails"); QTest::addColumn("whiteListEmail"); QTest::addColumn("hasPotentialPhishing"); - QTest::newRow("NoPotentialPhishing") << (QStringList() << QLatin1String("foo@kde.org")) << QStringList() << false; - QTest::newRow("HasPotentialPhishing") << (QStringList() << QLatin1String("\"bla@kde.org\" ")) << QStringList() << true; + QTest::newRow("NoPotentialPhishing") << (QStringList() << QLatin1String("foo@kde.org")) << QStringList() << false; + QTest::newRow("HasPotentialPhishing") << (QStringList() << QLatin1String("\"bla@kde.org\" ")) << QStringList() << true; const QString email = QLatin1String("\"bla@kde.org\" "); - QTest::newRow("EmailInWhiteList") << (QStringList() << email) << (QStringList() << email) << false; - QTest::newRow("NotAllEmailInWhiteList") << (QStringList() << email << QLatin1String("\"c@kde.org\" ")) << (QStringList() << email) << true; - QTest::newRow("EmailInWhiteListWithSpace") << (QStringList() << QLatin1String(" \"bla@kde.org\" ")) << (QStringList() << email) << false; + QTest::newRow("EmailInWhiteList") << (QStringList() << email) << (QStringList() << email) << false; + QTest::newRow("NotAllEmailInWhiteList") << (QStringList() << email << QLatin1String("\"c@kde.org\" ")) << (QStringList() << email) << true; + QTest::newRow("EmailInWhiteListWithSpace") << (QStringList() << QLatin1String(" \"bla@kde.org\" ")) << (QStringList() << email) << false; } void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails() { - QFETCH( QStringList, listEmails ); - QFETCH( QStringList,whiteListEmail ); - QFETCH( bool, hasPotentialPhishing ); + QFETCH(QStringList, listEmails); + QFETCH(QStringList, whiteListEmail); + QFETCH(bool, hasPotentialPhishing); PotentialPhishingEmailJob *job = new PotentialPhishingEmailJob; job->setEmailWhiteList(whiteListEmail); @@ -77,5 +77,4 @@ void PotentialPhishingEmailJobTest::shouldEmitSignal() QCOMPARE(spy.count(), 1); } - QTEST_MAIN(PotentialPhishingEmailJobTest) diff --git a/editor/potentialphishingemail/potentialphishingdetaildialog.cpp b/editor/potentialphishingemail/potentialphishingdetaildialog.cpp index ab57fa3db..ffbdab308 100644 --- a/editor/potentialphishingemail/potentialphishingdetaildialog.cpp +++ b/editor/potentialphishingemail/potentialphishingdetaildialog.cpp @@ -25,17 +25,16 @@ #include #include - PotentialPhishingDetailDialog::PotentialPhishingDetailDialog(QWidget *parent) : KDialog(parent) { - setCaption( i18n( "Details" ) ); - setButtons( Ok|Cancel ); - setDefaultButton( Ok ); + setCaption(i18n("Details")); + setButtons(Ok | Cancel); + setDefaultButton(Ok); - setModal( true ); - QWidget *mainWidget = new QWidget( this ); - QVBoxLayout *mainLayout = new QVBoxLayout( mainWidget ); + setModal(true); + QWidget *mainWidget = new QWidget(this); + QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); QLabel *lab = new QLabel(i18n("Select email to put in whitelist:")); lab->setObjectName(QLatin1String("label")); mainLayout->addWidget(lab); @@ -58,7 +57,7 @@ void PotentialPhishingDetailDialog::fillList(const QStringList &lst) { mListWidget->clear(); QStringList emailsAdded; - Q_FOREACH(const QString & mail, lst) { + Q_FOREACH (const QString &mail, lst) { if (!emailsAdded.contains(mail)) { QListWidgetItem *item = new QListWidgetItem(mListWidget); item->setCheckState(Qt::Unchecked); @@ -70,25 +69,25 @@ void PotentialPhishingDetailDialog::fillList(const QStringList &lst) void PotentialPhishingDetailDialog::readConfig() { - KConfigGroup group( KSharedConfig::openConfig(), "PotentialPhishingDetailDialog" ); - const QSize sizeDialog = group.readEntry( "Size", QSize(800,600) ); - if ( sizeDialog.isValid() ) { - resize( sizeDialog ); + KConfigGroup group(KSharedConfig::openConfig(), "PotentialPhishingDetailDialog"); + const QSize sizeDialog = group.readEntry("Size", QSize(800, 600)); + if (sizeDialog.isValid()) { + resize(sizeDialog); } } void PotentialPhishingDetailDialog::writeConfig() { - KConfigGroup group( KSharedConfig::openConfig(), "PotentialPhishingDetailDialog" ); - group.writeEntry( "Size", size() ); + KConfigGroup group(KSharedConfig::openConfig(), "PotentialPhishingDetailDialog"); + group.writeEntry("Size", size()); } void PotentialPhishingDetailDialog::slotSave() { - KConfigGroup group( KSharedConfig::openConfig(), "PotentialPhishing"); + KConfigGroup group(KSharedConfig::openConfig(), "PotentialPhishing"); QStringList potentialPhishing = group.readEntry("whiteList", QStringList()); bool emailsAdded = false; - for (int i=0; i < mListWidget->count(); ++i) { + for (int i = 0; i < mListWidget->count(); ++i) { QListWidgetItem *item = mListWidget->item(i); if (item->checkState() == Qt::Checked) { QString email = item->text(); @@ -98,7 +97,8 @@ void PotentialPhishingDetailDialog::slotSave() } } } - if (emailsAdded) - group.writeEntry( "whiteList", potentialPhishing); + if (emailsAdded) { + group.writeEntry("whiteList", potentialPhishing); + } accept(); } diff --git a/editor/potentialphishingemail/potentialphishingdetaildialog.h b/editor/potentialphishingemail/potentialphishingdetaildialog.h index a3a6969b9..1259b15c0 100644 --- a/editor/potentialphishingemail/potentialphishingdetaildialog.h +++ b/editor/potentialphishingemail/potentialphishingdetaildialog.h @@ -27,7 +27,7 @@ class PotentialPhishingDetailDialog : public KDialog { Q_OBJECT public: - explicit PotentialPhishingDetailDialog(QWidget *parent=0); + explicit PotentialPhishingDetailDialog(QWidget *parent = 0); ~PotentialPhishingDetailDialog(); void fillList(const QStringList &lst); diff --git a/editor/potentialphishingemail/potentialphishingemailjob.cpp b/editor/potentialphishingemail/potentialphishingemailjob.cpp index c0fb4e333..1ca883e70 100644 --- a/editor/potentialphishingemail/potentialphishingemailjob.cpp +++ b/editor/potentialphishingemail/potentialphishingemailjob.cpp @@ -54,10 +54,10 @@ bool PotentialPhishingEmailJob::start() deleteLater(); return false; } - Q_FOREACH(const QString &addr, mEmails) { + Q_FOREACH (const QString &addr, mEmails) { if (!mEmailWhiteList.contains(addr.trimmed())) { QString tname, temail; - KEmailAddress::extractEmailAddressAndName( addr, temail, tname ); // ignore return value + KEmailAddress::extractEmailAddressAndName(addr, temail, tname); // ignore return value // which is always false if (tname.contains(QLatin1String("@"))) { //Potential address if (temail != tname) { diff --git a/editor/potentialphishingemail/potentialphishingemailwarning.cpp b/editor/potentialphishingemail/potentialphishingemailwarning.cpp index 2cfcb93f4..943020782 100644 --- a/editor/potentialphishingemail/potentialphishingemailwarning.cpp +++ b/editor/potentialphishingemail/potentialphishingemailwarning.cpp @@ -18,7 +18,6 @@ */ - #include "potentialphishingemailwarning.h" #include "potentialphishingdetaildialog.h" #include @@ -36,9 +35,9 @@ PotentialPhishingEmailWarning::PotentialPhishingEmailWarning(QWidget *parent) setText(i18n("Some address mail seems a potential phishing email (Details...)")); connect(this, SIGNAL(linkActivated(QString)), SLOT(slotShowDetails(QString))); - QAction *action = new QAction(i18n( "Send Now" ), this ); - connect( action, SIGNAL(triggered(bool)), SIGNAL(sendNow()) ); - addAction( action ); + QAction *action = new QAction(i18n("Send Now"), this); + connect(action, SIGNAL(triggered(bool)), SIGNAL(sendNow())); + addAction(action); } PotentialPhishingEmailWarning::~PotentialPhishingEmailWarning() @@ -58,8 +57,8 @@ void PotentialPhishingEmailWarning::slotShowDetails(const QString &link) void PotentialPhishingEmailWarning::setPotentialPhisingEmail(const QStringList &lst) { - mPotentialPhishingEmails = lst; - if (!mPotentialPhishingEmails.isEmpty()) { - animatedShow(); - } + mPotentialPhishingEmails = lst; + if (!mPotentialPhishingEmails.isEmpty()) { + animatedShow(); + } } diff --git a/kmkernel.cpp b/kmkernel.cpp index 048d287d6..b4cbe248f 100644 --- a/kmkernel.cpp +++ b/kmkernel.cpp @@ -349,7 +349,7 @@ bool KMKernel::handleCommandLine(bool noArgsOpensReader) it != end; ++it) { if (!(*it).isEmpty()) { if ((*it) != QLatin1String("--")) { - attachURLs.append(makeAbsoluteUrl(*it)); + attachURLs.append(makeAbsoluteUrl(*it)); } } }