From kde-commits  Tue Apr 30 20:59:23 2013
From: Montel Laurent <montel () kde ! org>
Date: Tue, 30 Apr 2013 20:59:23 +0000
To: kde-commits
Subject: [kdepim] pimactivity/pimwidgets/identity: Minor
Message-Id: <20130430205923.9EEB7A603F () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=136735557216670

Git commit 901e513634f88b34e9f34518e482e77c6a65beee by Montel Laurent.
Committed on 30/04/2013 at 22:59.
Pushed by mlaurent into branch 'master'.

Minor

M  +8    -19   pimactivity/pimwidgets/identity/identitycomboboxactivity.cpp
M  +2    -5    pimactivity/pimwidgets/identity/identitycomboboxactivity.h

http://commits.kde.org/kdepim/901e513634f88b34e9f34518e482e77c6a65beee

diff --git a/pimactivity/pimwidgets/identity/identitycomboboxactivity.cpp b=
/pimactivity/pimwidgets/identity/identitycomboboxactivity.cpp
index 818185a..e1ceedf 100644
--- a/pimactivity/pimwidgets/identity/identitycomboboxactivity.cpp
+++ b/pimactivity/pimwidgets/identity/identitycomboboxactivity.cpp
@@ -17,28 +17,29 @@
 =

 #include "identitycomboboxactivity.h"
 #include "activitymanager.h"
+#include "identitymanageractivity.h"
 =

 namespace PimActivity {
 class IdentityComboboxActivityPrivate
 {
 public:
-    IdentityComboboxActivityPrivate(ActivityManager *manager, IdentityComb=
oboxActivity *qq)
-        : activityManager(manager),
+    IdentityComboboxActivityPrivate(IdentityManagerActivity *manager, Iden=
tityComboboxActivity *qq)
+        : identityManagerActivity(manager),
           q(qq)
     {
     }
 =

     void connectSignals()
     {
-        if (activityManager) {
-            q->connect(activityManager, SIGNAL(currentActivityChanged(QStr=
ing)), q, SLOT(slotCurrentActivityChanged(QString)));
+        if (identityManagerActivity->activityManager()) {
+            q->connect(identityManagerActivity->activityManager(), SIGNAL(=
currentActivityChanged(QString)), q, SLOT(slotCurrentActivityChanged(QStrin=
g)));
             initializeActivity();
         }
     }
 =

     void initializeActivity()
     {
-        slotCurrentActivityChanged(activityManager->currentActivity());
+        slotCurrentActivityChanged(identityManagerActivity->activityManage=
r()->currentActivity());
     }
 =

     void slotCurrentActivityChanged(const QString &id)
@@ -47,18 +48,12 @@ public:
         q->updateComboboxList(id);
     }
 =

-    ActivityManager *activityManager;
+    IdentityManagerActivity *identityManagerActivity;
     IdentityComboboxActivity *q;
 };
 =

 =

-IdentityComboboxActivity::IdentityComboboxActivity(QWidget *parent)
-    : KComboBox(parent), d(new IdentityComboboxActivityPrivate(0, this))
-{
-}
-
-
-IdentityComboboxActivity::IdentityComboboxActivity(ActivityManager *manage=
r, QWidget *parent)
+IdentityComboboxActivity::IdentityComboboxActivity(IdentityManagerActivity=
 *manager, QWidget *parent)
     : KComboBox(parent), d(new IdentityComboboxActivityPrivate(manager, th=
is))
 {
     d->connectSignals();
@@ -69,12 +64,6 @@ IdentityComboboxActivity::~IdentityComboboxActivity()
     delete d;
 }
 =

-void IdentityComboboxActivity::setActivityManager(ActivityManager *manager)
-{
-    d->activityManager =3D manager;
-    d->connectSignals();
-}
-
 void IdentityComboboxActivity::updateComboboxList(const QString &id)
 {
     clear();
diff --git a/pimactivity/pimwidgets/identity/identitycomboboxactivity.h b/p=
imactivity/pimwidgets/identity/identitycomboboxactivity.h
index c155017..7fd6fec 100644
--- a/pimactivity/pimwidgets/identity/identitycomboboxactivity.h
+++ b/pimactivity/pimwidgets/identity/identitycomboboxactivity.h
@@ -23,17 +23,14 @@
 =

 namespace PimActivity {
 class IdentityComboboxActivityPrivate;
-class ActivityManager;
+class IdentityManagerActivity;
 class PIMACTIVITY_EXPORT IdentityComboboxActivity : public KComboBox
 {
     Q_OBJECT
 public:
-    explicit IdentityComboboxActivity(QWidget *parent =3D 0);
-    explicit IdentityComboboxActivity(ActivityManager *manager, QWidget *p=
arent =3D 0);
+    explicit IdentityComboboxActivity(IdentityManagerActivity *manager, QW=
idget *parent =3D 0);
     ~IdentityComboboxActivity();
 =

-    void setActivityManager(ActivityManager *manager);
-
 protected Q_SLOTS:
     void updateComboboxList(const QString &id);
=20