From 6a6425dff5fb12bf7522dd3c0894a43336667263 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Mon, 6 Feb 2012 08:32:59 +0100 Subject: Don't hardcode the number 14 in meta-object generators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 14 is the number of fields (ints) in the QMetaObjectPrivate struct as of revision 6. Use the calculated number of fields instead, so that the code will still be correct when more fields are added in future revisions. Change-Id: I4f2c2bfc125f3fabc8e8caedf5c6ba6c17a34d06 Reviewed-by: Olivier Goffart Reviewed-by: Bradley T. Hughes Reviewed-by: Jędrzej Nowacki --- src/corelib/kernel/qmetaobjectbuilder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp') diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index a19f1fde80..e22257b0d8 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1160,7 +1160,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, QMetaObjectPrivate *pmeta = reinterpret_cast(buf + size); int pmetaSize = size; - dataIndex = 14; // Number of fields in the QMetaObjectPrivate. + dataIndex = MetaObjectPrivateFieldCount; for (index = 0; index < d->properties.size(); ++index) { if (d->properties[index].notifySignal != -1) { hasNotifySignals = true; @@ -1238,7 +1238,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, } // Reset the current data position to just past the QMetaObjectPrivate. - dataIndex = 14; + dataIndex = MetaObjectPrivateFieldCount; // Add the class name to the string table. int offset = 0; -- cgit v1.2.3