Renamed to kindentitymanager

CMakeLists.txt

@@ -147,7 +147,7 @@ KF5::CalendarCore
 KF5::CalendarUtils
 KF5::Abc
 KF5::Mime
-KF5::PimIdentities
+KF5::IdentityManagement
 KF5::MailTransport
 KF5::AkonadiCore
 KF5::AkonadiMime

emailidcombo.cpp

@@ -24,8 +24,8 @@
 #include <QKeyEvent>
 
 
-EmailIdCombo::EmailIdCombo(KPIMIdentities::IdentityManager* manager, QWidget* parent)
-    : KPIMIdentities::IdentityCombo(manager, parent),
+EmailIdCombo::EmailIdCombo(KIdentityManagement::IdentityManager* manager, QWidget* parent)
+    : KIdentityManagement::IdentityCombo(manager, parent),
       mReadOnly(false)
 { }
 
@@ -37,31 +37,31 @@ void EmailIdCombo::mousePressEvent(QMouseEvent* e)
         if (e->button() == Qt::LeftButton)
             return;
     }
-    KPIMIdentities::IdentityCombo::mousePressEvent(e);
+    KIdentityManagement::IdentityCombo::mousePressEvent(e);
 }
 
 void EmailIdCombo::mouseReleaseEvent(QMouseEvent* e)
 {
     if (!mReadOnly)
-        KPIMIdentities::IdentityCombo::mouseReleaseEvent(e);
+        KIdentityManagement::IdentityCombo::mouseReleaseEvent(e);
 }
 
 void EmailIdCombo::mouseMoveEvent(QMouseEvent* e)
 {
     if (!mReadOnly)
-        KPIMIdentities::IdentityCombo::mouseMoveEvent(e);
+        KIdentityManagement::IdentityCombo::mouseMoveEvent(e);
 }
 
 void EmailIdCombo::keyPressEvent(QKeyEvent* e)
 {
     if (!mReadOnly  ||  e->key() == Qt::Key_Escape)
-        KPIMIdentities::IdentityCombo::keyPressEvent(e);
+        KIdentityManagement::IdentityCombo::keyPressEvent(e);
 }
 
 void EmailIdCombo::keyReleaseEvent(QKeyEvent* e)
 {
     if (!mReadOnly)
-        KPIMIdentities::IdentityCombo::keyReleaseEvent(e);
+        KIdentityManagement::IdentityCombo::keyReleaseEvent(e);
 }
 #include "moc_emailidcombo.cpp"
 // vim: et sw=4:

emailidcombo.h

@@ -22,17 +22,17 @@
 #define EMAILIDCOMBO_H
 
 #include "combobox.h"
-#include <KPIMIdentities/kpimidentities/identitycombo.h>
+#include <KIdentityManagement/kidentitymanagement/identitycombo.h>
 
 class QMouseEvent;
 class QKeyEvent;
 
 
-class EmailIdCombo : public KPIMIdentities::IdentityCombo
+class EmailIdCombo : public KIdentityManagement::IdentityCombo
 {
         Q_OBJECT
     public:
-        explicit EmailIdCombo(KPIMIdentities::IdentityManager*, QWidget* parent = 0);
+        explicit EmailIdCombo(KIdentityManagement::IdentityManager*, QWidget* parent = 0);
         void  setReadOnly(bool ro)    { mReadOnly = ro; }
 
     protected:

functions.cpp

@@ -49,8 +49,8 @@
 #include <KCalCore/Person>
 #include <KCalCore/Duration>
 using namespace KCalCore;
-#include <KPIMIdentities/kpimidentities/identitymanager.h>
-#include <KPIMIdentities/kpimidentities/identity.h>
+#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
+#include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KHolidays/kholidays/holidays.h>
 
 #include <kconfiggroup.h>

kamail.cpp

@@ -28,8 +28,8 @@
 #include "preferences.h"
 
 #include <kalarmcal/identities.h>
-#include <KPIMIdentities/kpimidentities/identitymanager.h>
-#include <KPIMIdentities/kpimidentities/identity.h>
+#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
+#include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KPIMUtils/kpimutils/email.h>
 #include <MailTransport/mailtransport/transportmanager.h>
 #include <MailTransport/mailtransport/transport.h>
@@ -107,7 +107,7 @@ KAMail* KAMail::instance()
 int KAMail::send(JobData& jobdata, QStringList& errmsgs)
 {
     QString err;
-    KPIMIdentities::Identity identity;
+    KIdentityManagement::Identity identity;
     if (!jobdata.event.emailFromId())
         jobdata.from = Preferences::emailAddress();
     else

preferences.cpp

@@ -27,8 +27,8 @@
 
 #include <kalarmcal/identities.h>
 
-#include <KPIMIdentities/kpimidentities/identity.h>
-#include <KPIMIdentities/kpimidentities/identitymanager.h>
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
 #include <KHolidays/kholidays/holidays.h>
 
 #include <kglobal.h>