iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support for Qt5

Browse Source
This commit is contained in:
craig.p.drummond
2013-02-08 17:57:02 +00:00
committed by craig.p.drummond
parent 4e48b6b9ff
commit cb1d5b4b26
42 changed files with 594 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
solid-lite/devicemanager.cpp
View File

@@ -32,6 +32,12 @@
SOLID_GLOBAL_STATIC(Solid::DeviceManagerStorage, globalDeviceStorage)
#if QT_VERSION < 0x050000
#define QtPointer QWeakPointer
#else
#define QtPointer QPointer
#endif
Solid::DeviceManagerPrivate::DeviceManagerPrivate()
: m_nullDevice(new DevicePrivate(QString()))
{
@@ -53,7 +59,7 @@ Solid::DeviceManagerPrivate::~DeviceManagerPrivate()
disconnect(backend, 0, this, 0);
}
foreach (QWeakPointer<DevicePrivate> dev, m_devicesMap) {
foreach (QtPointer<DevicePrivate> dev, m_devicesMap) {
if (!dev.data()->ref.deref()) {
delete dev.data();
}
@@ -228,7 +234,7 @@ Solid::DevicePrivate *Solid::DeviceManagerPrivate::findRegisteredDevice(const QS
DevicePrivate *devData = new DevicePrivate(udi);
devData->setBackendObject(iface);
QWeakPointer<DevicePrivate> ptr(devData);
QtPointer<DevicePrivate> ptr(devData);
m_devicesMap[udi] = ptr;
m_reverseMap[devData] = udi;