whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTouchDevicePrivate: deal in const QTouchDevice*s 

Avoids the copying of the contents when returning devices().

Remove an unneeded #include (already includes by public
header; unneeded there, too, but leaving for SC purposes).

Change-Id: Ifa9a3dc2c7fada01fb624527dd4d16d0cb32a658
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
bb10
Marc Mutz 2015-06-11 21:03:04 +02:00 committed by Simon Hausmann
parent 552fba2386
commit ca22a02296
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/kernel/qtouchdevice.cpp
View File

@ -195,7 +195,7 @@ void QTouchDevice::setName(const QString &name)
d->name = name;
}
typedef QList<QTouchDevice *> TouchDevices;
typedef QList<const QTouchDevice *> TouchDevices;
Q_GLOBAL_STATIC(TouchDevices, deviceList)
static QBasicMutex devicesMutex;
@ -214,26 +214,22 @@ static void cleanupDevicesList()
QList<const QTouchDevice *> QTouchDevice::devices()
{
QMutexLocker lock(&devicesMutex);
QList<QTouchDevice *> *devList = deviceList();
QList<const QTouchDevice *> constDevList;
for (int i = 0, count = devList->count(); i != count; ++i)
constDevList.append(devList->at(i));
return constDevList;
return *deviceList();
}
/*!
\internal
*/
bool QTouchDevicePrivate::isRegistered(QTouchDevice *dev)
bool QTouchDevicePrivate::isRegistered(const QTouchDevice *dev)
{
QMutexLocker lock(&devicesMutex);
QMutexLocker locker(&devicesMutex);
return deviceList()->contains(dev);
}
/*!
\internal
*/
void QTouchDevicePrivate::registerDevice(QTouchDevice *dev)
void QTouchDevicePrivate::registerDevice(const QTouchDevice *dev)
{
QMutexLocker lock(&devicesMutex);
if (deviceList()->isEmpty())

5
src/gui/kernel/qtouchdevice_p.h
View File

@ -45,7 +45,6 @@
// We mean it.
//
#include <QtCore/qobject.h>
#include <QtGui/qtouchdevice.h>
QT_BEGIN_NAMESPACE
@ -65,8 +64,8 @@ public:
QString name;
int maxTouchPoints;
static void registerDevice(QTouchDevice *dev);
static bool isRegistered(QTouchDevice *dev);
static void registerDevice(const QTouchDevice *dev);
static bool isRegistered(const QTouchDevice *dev);
};
QT_END_NAMESPACE