kdelibs4support--

12 years ago · e2e2d05349
parent ffabc8ab86
commit e2e2d05349
6 changed files with 7 additions and 12 deletions
--- 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>
--- 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>
--- 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>
--- 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),
--- 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();
 }

--- a/kcm_kpimidentities/kcm_kpimidentities.cpp
+++ b/kcm_kpimidentities/kcm_kpimidentities.cpp
@ -21,7 +21,6 @@
 */

 #include "identitypage.h"
-#include <kcomponentdata.h>


 extern "C"