summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel/qtouchevent
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2016-12-01 12:47:55 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-07 13:20:51 +0000
commit7df0c7a309ada7f9ab70a2c20f86c0707288e31e (patch)
tree5e273e84d3552ee9b0e4647c01d4c5b90b15da6a /tests/auto/gui/kernel/qtouchevent
parent14ea8759da0d5eb1888664a5b0d08c2bf142a6a2 (diff)
rename QPointerUniqueId -> QPointingDeviceUniqueId
Several people agreed that the name was confusing and that this one is better. Task-number: QTBUG-54616 Change-Id: I31cf057f4bc818332b0551a27d1711599440207c Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Diffstat (limited to 'tests/auto/gui/kernel/qtouchevent')
-rw-r--r--tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 02814b48e9..364b9332af 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -227,7 +227,7 @@ void tst_QTouchEvent::cleanup()
void tst_QTouchEvent::qPointerUniqueId()
{
- QPointerUniqueId id1, id2;
+ QPointingDeviceUniqueId id1, id2;
QCOMPARE(id1.numericId(), Q_INT64_C(-1));
QVERIFY(!id1.isValid());
@@ -235,13 +235,13 @@ void tst_QTouchEvent::qPointerUniqueId()
QVERIFY( id1 == id2);
QVERIFY(!(id1 != id2));
- QSet<QPointerUniqueId> set; // compile test
+ QSet<QPointingDeviceUniqueId> set; // compile test
set.insert(id1);
set.insert(id2);
QCOMPARE(set.size(), 1);
- const auto id3 = QPointerUniqueId::fromNumericId(-1);
+ const auto id3 = QPointingDeviceUniqueId::fromNumericId(-1);
QCOMPARE(id3.numericId(), Q_INT64_C(-1));
QVERIFY(!id3.isValid());
@@ -252,7 +252,7 @@ void tst_QTouchEvent::qPointerUniqueId()
QCOMPARE(set.size(), 1);
- const auto id4 = QPointerUniqueId::fromNumericId(4);
+ const auto id4 = QPointingDeviceUniqueId::fromNumericId(4);
QCOMPARE(id4.numericId(), Q_INT64_C(4));
QVERIFY(id4.isValid());