diff --git a/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp b/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp index 44f6707cf..a0b574302 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp @@ -50,11 +50,11 @@ void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails_data() 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("EmailWithSameNameAndDisplayName") << (QStringList() << QLatin1String("\"\" ")) << (QStringList() << email) << false; - QTest::newRow("EmailWithSameNameAndDisplayNameWithSpace") << (QStringList() << QLatin1String(" \"\" ")) << (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; + QTest::newRow("EmailWithSameNameAndDisplayName") << (QStringList() << QLatin1String("\"\" ")) << (QStringList() << email) << false; + QTest::newRow("EmailWithSameNameAndDisplayNameWithSpace") << (QStringList() << QLatin1String(" \"\" ")) << (QStringList() << email) << false; } void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails() diff --git a/editor/potentialphishingemail/potentialphishingemailjob.cpp b/editor/potentialphishingemail/potentialphishingemailjob.cpp index ce345495a..c02c7e32f 100644 --- a/editor/potentialphishingemail/potentialphishingemailjob.cpp +++ b/editor/potentialphishingemail/potentialphishingemailjob.cpp @@ -61,7 +61,7 @@ bool PotentialPhishingEmailJob::start() // which is always false if (tname.contains(QLatin1String("@"))) { //Potential address if (tname.startsWith(QLatin1Char('<')) && tname.endsWith(QLatin1Char('>'))) { - tname = tname.mid(1,tname.length()-2); + tname = tname.mid(1, tname.length() - 2); } if (temail != tname) { mPotentialPhisingEmails.append(addr); diff --git a/kmreadermainwin.cpp b/kmreadermainwin.cpp index e4c3bc386..44a3f0cf4 100644 --- a/kmreadermainwin.cpp +++ b/kmreadermainwin.cpp @@ -371,13 +371,12 @@ QAction *KMReaderMainWin::copyActionMenu(QMenu *menu) QAction *KMReaderMainWin::moveActionMenu(QMenu *menu) { - KMMainWidget* mainwin = kmkernel->getKMMainWidget(); - if ( mainwin ) - { - KActionMenu *action = new KActionMenu( menu ); - action->setText(i18n("Move Message To...") ); - mainwin->standardMailActionManager()->standardActionManager()->createActionFolderMenu( action->menu(), Akonadi::StandardActionManager::MoveItemToMenu ); - connect( action->menu(), SIGNAL(triggered(QAction*)), SLOT(slotMoveItem(QAction*)) ); + KMMainWidget *mainwin = kmkernel->getKMMainWidget(); + if (mainwin) { + KActionMenu *action = new KActionMenu(menu); + action->setText(i18n("Move Message To...")); + mainwin->standardMailActionManager()->standardActionManager()->createActionFolderMenu(action->menu(), Akonadi::StandardActionManager::MoveItemToMenu); + connect(action->menu(), SIGNAL(triggered(QAction*)), SLOT(slotMoveItem(QAction*))); return action; } @@ -387,19 +386,16 @@ QAction *KMReaderMainWin::moveActionMenu(QMenu *menu) void KMReaderMainWin::slotMoveItem(QAction *action) { - if ( action ) - { + if (action) { const QModelIndex index = action->data().value(); - const Akonadi::Collection collection = index.data( Akonadi::EntityTreeModel::CollectionRole ).value(); + const Akonadi::Collection collection = index.data(Akonadi::EntityTreeModel::CollectionRole).value(); - if ( mMsg.isValid() ) { - Akonadi::ItemMoveJob *job = new Akonadi::ItemMoveJob( mMsg, collection,this ); - connect( job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*)) ); - } - else - { - Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob( mMsg, collection, this ); - connect( job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*)) ); + if (mMsg.isValid()) { + Akonadi::ItemMoveJob *job = new Akonadi::ItemMoveJob(mMsg, collection, this); + connect(job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*))); + } else { + Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(mMsg, collection, this); + connect(job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*))); } } } @@ -420,7 +416,7 @@ void KMReaderMainWin::slotCopyItem(QAction *action) } } -void KMReaderMainWin::slotCopyMoveResult( KJob * job ) +void KMReaderMainWin::slotCopyMoveResult(KJob *job) { if (job->error()) { KMessageBox::sorry(this, i18n("Cannot copy item. %1", job->errorString())); @@ -574,8 +570,8 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg , const QUrl &ur menu->addAction(mMsgActions->forwardMenu()); menu->addSeparator(); } - menu->addAction( copyActionMenu(menu) ); - menu->addAction( moveActionMenu(menu)); + menu->addAction(copyActionMenu(menu)); + menu->addAction(moveActionMenu(menu)); menu->addSeparator(); if (!imageUrl.isEmpty()) { diff --git a/kmreadermainwin.h b/kmreadermainwin.h index ac3cc1a91..21b65427b 100644 --- a/kmreadermainwin.h +++ b/kmreadermainwin.h @@ -77,7 +77,7 @@ private Q_SLOTS: /// forwarding is set. void slotReplyOrForwardFinished(); void slotCopyItem(QAction *); - void slotCopyMoveResult( KJob * job ); + void slotCopyMoveResult(KJob *job); void slotMoveItem(QAction *action); private: