From e2e2d053491e4e3ead7500b594f063ff951befbe Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 14 Aug 2014 22:20:09 +0200
Subject: [PATCH] kdelibs4support--

---
 collectionpage/collectionmaintenancepage.cpp        | 4 +---
 dialog/archivefolderdialog.cpp                      | 2 +-
 folderarchive/folderarchiveagentcheckcollection.cpp | 2 +-
 folderarchive/folderarchiveagentjob.cpp             | 2 +-
 folderarchive/folderarchivemanager.cpp              | 8 +++-----
 kcm_kpimidentities/kcm_kpimidentities.cpp           | 1 -
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/collectionpage/collectionmaintenancepage.cpp b/collectionpage/collectionmaintenancepage.cpp
index 0d68666be..fef10eca5 100644
--- a/collectionpage/collectionmaintenancepage.cpp
+++ b/collectionpage/collectionmaintenancepage.cpp
@@ -29,11 +29,9 @@
 #include <QDBusConnectionInterface>
 
 #include <QDialog>
-#include <KLocalizedString>
-#include <KLocale>
 #include <QPushButton>
 #include <kio/global.h>
-#include <KLocale>
+#include <KLocalizedString>
 #include <QDebug>
 #include <QGroupBox>
 #include <QLabel>
diff --git a/dialog/archivefolderdialog.cpp b/dialog/archivefolderdialog.cpp
index ce7be9795..28ef3722a 100644
--- a/dialog/archivefolderdialog.cpp
+++ b/dialog/archivefolderdialog.cpp
@@ -26,7 +26,7 @@
 
 #include <AkonadiCore/Collection>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
diff --git a/folderarchive/folderarchiveagentcheckcollection.cpp b/folderarchive/folderarchiveagentcheckcollection.cpp
index d6318db34..90644ae15 100644
--- a/folderarchive/folderarchiveagentcheckcollection.cpp
+++ b/folderarchive/folderarchiveagentcheckcollection.cpp
@@ -18,7 +18,7 @@
 #include "folderarchiveagentcheckcollection.h"
 #include "folderarchiveaccountinfo.h"
 
-#include <KLocale>
+#include <KLocalizedString>
 
 #include <AkonadiCore/CollectionFetchJob>
 #include <AkonadiCore/CollectionCreateJob>
diff --git a/folderarchive/folderarchiveagentjob.cpp b/folderarchive/folderarchiveagentjob.cpp
index d9bea48e4..f177ee336 100644
--- a/folderarchive/folderarchiveagentjob.cpp
+++ b/folderarchive/folderarchiveagentjob.cpp
@@ -26,7 +26,7 @@
 #include <AkonadiCore/ItemMoveJob>
 #include <AkonadiCore/CollectionFetchJob>
 
-#include <KLocale>
+#include <KLocalizedString>
 
 FolderArchiveAgentJob::FolderArchiveAgentJob(FolderArchiveManager *manager, FolderArchiveAccountInfo *info, const QList<Akonadi::Item> &lstItem, QObject *parent)
     : QObject(parent),
diff --git a/folderarchive/folderarchivemanager.cpp b/folderarchive/folderarchivemanager.cpp
index 6bb60279a..7eb414fd8 100644
--- a/folderarchive/folderarchivemanager.cpp
+++ b/folderarchive/folderarchivemanager.cpp
@@ -27,12 +27,10 @@
 #include <AkonadiCore/CollectionFetchJob>
 
 #include <KSharedConfig>
-#include <KGlobal>
 #include <KNotification>
+#include <KLocalizedString>
 #include <QIcon>
-#include <KLocale>
 #include <KIconLoader>
-#include <KComponentData>
 #include <QDebug>
 
 FolderArchiveManager::FolderArchiveManager(QObject *parent)
@@ -184,7 +182,7 @@ void FolderArchiveManager::moveDone()
                           pixmap,
                           0,
                           KNotification::CloseOnTimeout,
-                          KComponentData::mainComponent().componentName());
+                          QLatin1String("kmail2"));
     nextJob();
 }
 
@@ -197,7 +195,7 @@ void FolderArchiveManager::moveFailed(const QString &msg)
                           pixmap,
                           0,
                           KNotification::CloseOnTimeout,
-                          KComponentData::mainComponent().componentName());
+                          QLatin1String("kmail2"));
     nextJob();
 }
 
diff --git a/kcm_kpimidentities/kcm_kpimidentities.cpp b/kcm_kpimidentities/kcm_kpimidentities.cpp
index bfb11afe6..77ebe633a 100644
--- a/kcm_kpimidentities/kcm_kpimidentities.cpp
+++ b/kcm_kpimidentities/kcm_kpimidentities.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "identitypage.h"
-#include <kcomponentdata.h>
 
 
 extern "C"