From 679492ecc68880babb61b4567ea5f8ef6f6293b3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 30 Apr 2019 10:16:12 +0200 Subject: Clean up QMetaEnum code Change-Id: I9c1fcfd72890fb3d69d2d9caed7f3cff931c3ff6 Reviewed-by: Simon Hausmann Reviewed-by: Ulf Hermann --- src/corelib/kernel/qmetaobjectbuilder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp') diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 7b9b06ed3e..1212f84bf4 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1244,7 +1244,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, pmeta->enumeratorCount = int(d->enumerators.size()); pmeta->enumeratorData = dataIndex; - dataIndex += 5 * int(d->enumerators.size()); + dataIndex += QMetaObjectPrivate::IntsPerEnum * int(d->enumerators.size()); pmeta->constructorCount = int(d->constructors.size()); pmeta->constructorData = dataIndex; @@ -1261,7 +1261,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, dataIndex += int(d->properties.size()); if (hasRevisionedProperties) dataIndex += int(d->properties.size()); - dataIndex += 5 * int(d->enumerators.size()); + dataIndex += QMetaObjectPrivate::IntsPerEnum * int(d->enumerators.size()); dataIndex += QMetaObjectPrivate::IntsPerMethod * int(d->constructors.size()); } @@ -1432,7 +1432,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, data[enumOffset++] = enumerator.values[key]; } } - dataIndex += 5; + dataIndex += QMetaObjectPrivate::IntsPerEnum; enumIndex += 2 * count; } -- cgit v1.2.3