Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/antispam-virus/antispamwizard.cpp
	kmail/antispam-virus/antispamwizard.h
	kmail/kmmainwidget.cpp
	messagecomposer/job/attachmentvcardfromaddressbookjob.cpp

antispam-virus/antispamwizard.cpp

@@ -578,11 +578,7 @@ void AntiSpamWizard::checkToolAvailability()
 
 void AntiSpamWizard::slotHelpClicked()
 {
-    if (mMode == AntiSpam) {
-        KHelpClient::invokeHelp(QLatin1String("the-anti-spam-wizard"), QLatin1String("kmail"));
-    } else {
-        KHelpClient::invokeHelp(QLatin1String("the-anti-virus-wizard"), QLatin1String("kmail"));
-    }
+    KHelpClient::invokeHelp( (mMode == AntiSpam) ? QLatin1String("the-anti-spam-wizard") : QLatin1String("the-anti-virus-wizard") , QLatin1String("kmail") );
 }
 
 void AntiSpamWizard::slotBuildSummary()
@@ -870,29 +866,25 @@ void AntiSpamWizard::ConfigReader::sortToolList()
 }
 
 //---------------------------------------------------------------------------
-ASWizPage::ASWizPage(QWidget *parent, const QString &name,
-                     const QString *bannerName)
+ASWizPage::ASWizPage(QWidget *parent, const QString &name)
     : QWidget(parent)
 {
     setObjectName(name);
-    QString banner = QLatin1String("kmwizard.png");
-    if (bannerName && !bannerName->isEmpty()) {
-        banner = *bannerName;
-    }
+    const QString banner = QLatin1String("kmwizard.png");
     mLayout = new QHBoxLayout(this);
 
     QVBoxLayout *sideLayout = new QVBoxLayout();
     mLayout->addItem(sideLayout);
     mLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Minimum, QSizePolicy::Expanding));
 
-    mBannerLabel = new QLabel(this);
-    mBannerLabel->setPixmap(UserIcon(banner));
-    mBannerLabel->setScaledContents(false);
-    mBannerLabel->setFrameShape(QFrame::StyledPanel);
-    mBannerLabel->setFrameShadow(QFrame::Sunken);
-    mBannerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    QLabel *bannerLabel = new QLabel(this);
+    bannerLabel->setPixmap(UserIcon(banner));
+    bannerLabel->setScaledContents(false);
+    bannerLabel->setFrameShape(QFrame::StyledPanel);
+    bannerLabel->setFrameShadow(QFrame::Sunken);
+    bannerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-    sideLayout->addWidget(mBannerLabel);
+    sideLayout->addWidget(bannerLabel);
     sideLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Minimum, QSizePolicy::Expanding));
 }
 
@@ -904,8 +896,8 @@ ASWizInfoPage::ASWizInfoPage(AntiSpamWizard::WizardMode mode,
     QBoxLayout *layout = new QVBoxLayout();
     mLayout->addItem(layout);
 
-    mIntroText = new QTextEdit(this);
-    mIntroText->setText(
+    QTextEdit *introText = new QTextEdit(this);
+    introText->setText(
         (mode == AntiSpamWizard::AntiSpam)
         ? i18n(
             "The wizard will search for any tools to do spam detection\n"
@@ -926,9 +918,9 @@ ASWizInfoPage::ASWizInfoPage(AntiSpamWizard::WizardMode mode,
             "deleting the filter rules created by the wizard to get "
             "back to the former behavior.</p>"
         ));
-    mIntroText->setReadOnly(true);
-    mIntroText->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,  QSizePolicy::Expanding));
-    layout->addWidget(mIntroText);
+    introText->setReadOnly(true);
+    introText->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,  QSizePolicy::Expanding));
+    layout->addWidget(introText);
 
     mScanProgressText = new QLabel(this);
     mScanProgressText->clear();

antispam-virus/antispamwizard.h

@@ -36,7 +36,6 @@
 #include <AkonadiCore/collection.h>
 
 class QLabel;
-class QTextEdit;
 class QCheckBox;
 class QBoxLayout;
 class QListWidget;
@@ -364,13 +363,10 @@ private:
 class ASWizPage : public QWidget
 {
 public:
-    ASWizPage(QWidget *parent, const QString &name,
-              const QString *bannerName = 0);
+    ASWizPage(QWidget *parent, const QString &name);
 
 protected:
     QBoxLayout *mLayout;
-private:
-    QLabel *mBannerLabel;
 };
 
 //---------------------------------------------------------------------------
@@ -393,7 +389,6 @@ Q_SIGNALS:
     void selectionChanged();
 
 private:
-    QTextEdit *mIntroText;
     QLabel *mScanProgressText;
     QLabel *mSelectionHint;
     QListWidget *mToolsList;

kmmainwidget.cpp

@@ -4017,7 +4017,9 @@ void KMMainWidget::updateFolderMenu()
 
     bool isInTrashFolder = (mCurrentFolder && CommonKernel->folderIsTrash(mCurrentFolder->collection()));
     akonadiStandardAction(Akonadi::StandardMailActionManager::MoveToTrash)->setText(isInTrashFolder ? i18nc("@action Hard delete, bypassing trash", "&Delete") : i18n("&Move to Trash"));
+    akonadiStandardAction( Akonadi::StandardMailActionManager::MoveToTrash )->setIcon( isInTrashFolder ? QIcon::fromTheme(QLatin1String("edit-delete"))  : QIcon::fromTheme(QLatin1String("user-trash") ));
 
+    mTrashThreadAction->setIcon(isInTrashFolder ? QIcon::fromTheme(QLatin1String("edit-delete") ) : QIcon::fromTheme(QLatin1String("user-trash") ) );
     mTrashThreadAction->setText(isInTrashFolder ? i18n("Delete T&hread") : i18n("M&ove Thread to Trash"));
 
     mSearchMessages->setText((mCurrentFolder && mCurrentFolder->collection().resource() == QLatin1String("akonadi_search_resource")) ? i18n("Edit Search...") : i18n("&Find Messages..."));