From 392ca26287bb573d7d8b61849d67154cf8a97835 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 9 Apr 2016 22:19:21 +0300 Subject: [PATCH] Debugger: Minor cleanup in offset tests * Remove unneeded STRINGIFY macro * Add :: between class and member in test names * Remove extra comma Change-Id: I5a5e9d318133934885c0bdf6aefc1fd3abc2acb0 Reviewed-by: Christian Stenger --- tests/auto/debugger/tst_offsets.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index c7e6f5534bf..9256021c1f1 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -60,13 +60,10 @@ class Access const int Name = offset(Tag()) #define OFFSET_ACCESS(Type, Class, Member) \ - OFFSET_ACCESS0(Class ## _## Member, tag_ ## Class ## _ ## Member, Type, Class, Member) - -#define STRINGIFY_INTERNAL(x) #x -#define STRINGIFY(x) STRINGIFY_INTERNAL(x) + OFFSET_ACCESS0(Class ## _ ## Member, tag_ ## Class ## _ ## Member, Type, Class, Member) #define OFFSET_TEST(Class, Member) \ - QTest::newRow(STRINGIFY(Class) STRINGIFY(Member)) << Class ## _ ## Member + QTest::newRow(#Class "::" #Member) << Class ## _ ## Member OFFSET_ACCESS(QString, QFilePrivate, fileName); @@ -81,7 +78,7 @@ OFFSET_ACCESS(QString, QObjectPrivate, objectName); #if QT_VERSION < 0x50200 OFFSET_ACCESS(QDate, QDateTimePrivate, date); OFFSET_ACCESS(QTime, QDateTimePrivate, time); -OFFSET_ACCESS(Qt::TimeSpec,, QDateTimePrivate, spec); +OFFSET_ACCESS(Qt::TimeSpec, QDateTimePrivate, spec); OFFSET_ACCESS(int, QDateTimePrivate, utcOffset); #else OFFSET_ACCESS(qint64, QDateTimePrivate, m_msecs);