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/qmetaobject_p.h | 4 ++++ src/corelib/kernel/qmetaobjectbuilder.cpp | 4 ++-- src/tools/moc/generator.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 5fc0555fb5..d6e49b92d2 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -152,6 +152,10 @@ struct QMetaObjectPrivate #endif }; +// For meta-object generators + +enum { MetaObjectPrivateFieldCount = sizeof(QMetaObjectPrivate) / sizeof(int) }; + #ifndef UTILS_H // mirrored in moc's utils.h static inline bool is_ident_char(char s) 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; diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index e2055e44e8..8242fb45ec 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -164,7 +164,7 @@ void Generator::generateCode() QByteArray qualifiedClassNameIdentifier = cdef->qualified; qualifiedClassNameIdentifier.replace(':', '_'); - int index = 14; + int index = MetaObjectPrivateFieldCount; fprintf(out, "static const uint qt_meta_data_%s[] = {\n", qualifiedClassNameIdentifier.constData()); fprintf(out, "\n // content:\n"); fprintf(out, " %4d, // revision\n", int(QMetaObjectPrivate::OutputRevision)); -- cgit v1.2.3