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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/kworkspace
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-05-14 23:10:24
Message-ID: 20100514231024.5E819AC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1126821 by aseigo:

make this ref counting thing work


 M  +10 -8     kactivitycontroller.cpp  


--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivitycontroller.cpp \
#1126820:1126821 @@ -20,18 +20,21 @@
 #include "kactivitycontrollerdbus_p.h"
 #include "kactivityconsumer_p.h"
 
+#include <KDebug>
 class KActivityController::Private {
 public:
-    QSharedPointer<KActivityControllerDbus> dbusController;
-
-    QWeakPointer<KActivityControllerDbus> \
                sharedDBusController(org::kde::ActivityManager *manager) {
-        if (!s_dbusController) {
-            s_dbusController = new KActivityControllerDbus(manager, 0);
+    Private()
+    {
+        if (s_dbusController) {
+            dbusController = s_dbusController;
+        } else {
+            dbusController = QSharedPointer<KActivityControllerDbus>(new \
KActivityControllerDbus(manager(), 0)); +            s_dbusController = \
dbusController;  }
-
-        return s_dbusController;
     }
 
+    QSharedPointer<KActivityControllerDbus> dbusController;
+
     org::kde::ActivityManager *manager()
     {
         return KActivityConsumerPrivate::manager();
@@ -45,7 +48,6 @@
 KActivityController::KActivityController(QObject * parent)
     : KActivityConsumer(parent), d(new Private())
 {
-    d->dbusController = d->sharedDBusController(d->manager());
     connect(d->dbusController.data(), SIGNAL(activityAdded(QString)), this, \
                SIGNAL(activityAdded(QString)));
     connect(d->dbusController.data(), SIGNAL(activityAdded(QString)), this, \
                SIGNAL(activityAdded(QString)));
     connect(d->dbusController.data(), SIGNAL(activityRemoved(QString)), this, \
SIGNAL(activityRemoved(QString)));


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