From 37e3b988c27d26add5c91e478cf3d3260d172e9d Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 02:48:33 +0200 Subject: [PATCH] QMetaObjectBuilder: replace an int with QFlags The int was used as a flag the entire time, except in one stance. So just use the right QFlags type instead, and replace that one usage with a call to toInt(). Change-Id: I3670e6afdc244df69189dd15b8c2c34573476e2f Reviewed-by: Thiago Macieira --- src/corelib/kernel/qmetaobjectbuilder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 8513805ef4..8bcc6e398a 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -224,7 +224,7 @@ public: QList classInfoValues; std::vector enumerators; QList relatedMetaObjects; - int flags; + MetaObjectFlags flags; }; bool QMetaObjectBuilderPrivate::hasRevisionedMethods() const @@ -325,7 +325,7 @@ void QMetaObjectBuilder::setSuperClass(const QMetaObject *meta) */ MetaObjectFlags QMetaObjectBuilder::flags() const { - return MetaObjectFlags(d->flags); + return d->flags; } /*! @@ -1205,7 +1205,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf, if constexpr (mode == Construct) { static_assert(QMetaObjectPrivate::OutputRevision == 10, "QMetaObjectBuilder should generate the same version as moc"); pmeta->revision = QMetaObjectPrivate::OutputRevision; - pmeta->flags = d->flags; + pmeta->flags = d->flags.toInt(); pmeta->className = 0; // Class name is always the first string. //pmeta->signalCount is handled in the "output method loop" as an optimization.