[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] pimactivity/pimwidgets/identity: Minor
From:       Montel Laurent <montel () kde ! org>
Date:       2013-04-30 20:59:23
Message-ID: 20130430205923.9EEB7A603F () git ! kde ! org
[Download RAW message or body]

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, \
                IdentityComboboxActivity *qq)
-        : activityManager(manager),
+    IdentityComboboxActivityPrivate(IdentityManagerActivity *manager, \
IdentityComboboxActivity *qq) +        : identityManagerActivity(manager),
           q(qq)
     {
     }
 
     void connectSignals()
     {
-        if (activityManager) {
-            q->connect(activityManager, SIGNAL(currentActivityChanged(QString)), q, \
SLOT(slotCurrentActivityChanged(QString))); +        if \
(identityManagerActivity->activityManager()) { +            \
q->connect(identityManagerActivity->activityManager(), \
SIGNAL(currentActivityChanged(QString)), q, \
SLOT(slotCurrentActivityChanged(QString)));  initializeActivity();
         }
     }
 
     void initializeActivity()
     {
-        slotCurrentActivityChanged(activityManager->currentActivity());
+        slotCurrentActivityChanged(identityManagerActivity->activityManager()->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 *manager, QWidget \
*parent) +IdentityComboboxActivity::IdentityComboboxActivity(IdentityManagerActivity \
                *manager, QWidget *parent)
     : KComboBox(parent), d(new IdentityComboboxActivityPrivate(manager, this))
 {
     d->connectSignals();
@@ -69,12 +64,6 @@ IdentityComboboxActivity::~IdentityComboboxActivity()
     delete d;
 }
 
-void IdentityComboboxActivity::setActivityManager(ActivityManager *manager)
-{
-    d->activityManager = manager;
-    d->connectSignals();
-}
-
 void IdentityComboboxActivity::updateComboboxList(const QString &id)
 {
     clear();
diff --git a/pimactivity/pimwidgets/identity/identitycomboboxactivity.h \
b/pimactivity/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 = 0);
-    explicit IdentityComboboxActivity(ActivityManager *manager, QWidget *parent = \
0); +    explicit IdentityComboboxActivity(IdentityManagerActivity *manager, QWidget \
*parent = 0);  ~IdentityComboboxActivity();
 
-    void setActivityManager(ActivityManager *manager);
-
 protected Q_SLOTS:
     void updateComboboxList(const QString &id);
 


[prev in list] [next in list] [prev in thread] [next in thread]