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

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid: Port solid to QPointer.
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2013-02-19 17:58:08
Message-ID: 20130219175808.B0090A60DA () git ! kde ! org
[Download RAW message or body]

Git commit fe98ec6ebdfaff137a37fd04c281a300bcb794d8 by Stephen Kelly.
Committed on 19/02/2013 at 18:25.
Pushed by skelly into branch 'frameworks'.

Port solid to QPointer.

Using QWeakPointer as a QObject-tracker is deprecated.

M  +4    -7    tier1/solid/src/solid/device_p.h
M  +2    -2    tier1/solid/src/solid/deviceinterface_p.h
M  +2    -2    tier1/solid/src/solid/devicemanager.cpp
M  +2    -2    tier1/solid/src/solid/devicemanager_p.h

http://commits.kde.org/kdelibs/fe98ec6ebdfaff137a37fd04c281a300bcb794d8

diff --git a/tier1/solid/src/solid/device_p.h b/tier1/solid/src/solid/device_p.h
index bb2105b..12042ec 100644
--- a/tier1/solid/src/solid/device_p.h
+++ b/tier1/solid/src/solid/device_p.h
@@ -23,7 +23,9 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QSharedData>
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
+
+#include <ifaces/device.h>
 
 #if defined(Q_OS_WIN32)
 #undef interface
@@ -31,11 +33,6 @@
 
 namespace Solid
 {
-    namespace Ifaces
-    {
-        class Device;
-    }
-
     class DevicePrivate : public QObject, public QSharedData
     {
         Q_OBJECT
@@ -56,7 +53,7 @@ namespace Solid
 
     private:
         QString m_udi;
-        QWeakPointer<Ifaces::Device> m_backendObject;
+        QPointer<Ifaces::Device> m_backendObject;
         QMap<DeviceInterface::Type, DeviceInterface *> m_ifaces;
     };
 }
diff --git a/tier1/solid/src/solid/deviceinterface_p.h b/tier1/solid/src/solid/deviceinterface_p.h
index 822e824..d76a3af 100644
--- a/tier1/solid/src/solid/deviceinterface_p.h
+++ b/tier1/solid/src/solid/deviceinterface_p.h
@@ -21,7 +21,7 @@
 #ifndef SOLID_DEVICEINTERFACE_P_H
 #define SOLID_DEVICEINTERFACE_P_H
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
 
 namespace Solid
 {
@@ -37,7 +37,7 @@ namespace Solid
         void setDevicePrivate(DevicePrivate *devicePrivate);
 
     private:
-        QWeakPointer<QObject> m_backendObject;
+        QPointer<QObject> m_backendObject;
         DevicePrivate* m_devicePrivate;
     };
 }
diff --git a/tier1/solid/src/solid/devicemanager.cpp b/tier1/solid/src/solid/devicemanager.cpp
index 2ea0c53..7510707 100644
--- a/tier1/solid/src/solid/devicemanager.cpp
+++ b/tier1/solid/src/solid/devicemanager.cpp
@@ -53,7 +53,7 @@ Solid::DeviceManagerPrivate::~DeviceManagerPrivate()
         disconnect(backend, 0, this, 0);
     }
 
-    Q_FOREACH (QWeakPointer<DevicePrivate> dev, m_devicesMap) {
+    Q_FOREACH (QPointer<DevicePrivate> dev, m_devicesMap) {
         if (!dev.data()->ref.deref()) {
             delete dev.data();
         }
@@ -228,7 +228,7 @@ Solid::DevicePrivate *Solid::DeviceManagerPrivate::findRegisteredDevice(const QS
         DevicePrivate *devData = new DevicePrivate(udi);
         devData->setBackendObject(iface);
 
-        QWeakPointer<DevicePrivate> ptr(devData);
+        QPointer<DevicePrivate> ptr(devData);
         m_devicesMap[udi] = ptr;
         m_reverseMap[devData] = udi;
 
diff --git a/tier1/solid/src/solid/devicemanager_p.h b/tier1/solid/src/solid/devicemanager_p.h
index 0d8bd8e..d2a46ea 100644
--- a/tier1/solid/src/solid/devicemanager_p.h
+++ b/tier1/solid/src/solid/devicemanager_p.h
@@ -26,7 +26,7 @@
 #include "devicenotifier.h"
 
 #include <QtCore/QMap>
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
 #include <QtCore/QSharedData>
 #include <QtCore/QThreadStorage>
 
@@ -57,7 +57,7 @@ namespace Solid
         Ifaces::Device *createBackendObject(const QString &udi);
 
         QExplicitlySharedDataPointer<DevicePrivate> m_nullDevice;
-        QMap<QString, QWeakPointer<DevicePrivate> > m_devicesMap;
+        QMap<QString, QPointer<DevicePrivate> > m_devicesMap;
         QMap<QObject *, QString> m_reverseMap;
     };
 

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