diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-24 17:01:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-20 12:03:44 +0200 |
| commit | 5e43997a705a449f0596d36b93948da3b71c4567 (patch) | |
| tree | d946c113913cff10929fa925a665c6e29f5c7af3 /src | |
| parent | 0ce1865ffabfa2531baa9f79b3bbec295d6935bc (diff) | |
Use qmetaobject_p.h's MetaObjectFlag in QMetaObjectBuilder
This saves duplicating them with its own flags.
Task-number: QTBUG-85700
Change-Id: I9e938322fd787282cfd9f941f83af8c0d76aaa9d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder_p.h | 10 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index d205034d77..74136c3f6f 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2014 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ ** @@ -102,11 +102,13 @@ enum MethodFlags { MethodRevisioned = 0x80 }; -enum MetaObjectFlags { // keep it in sync with QMetaObjectBuilder::MetaObjectFlag enum +enum MetaObjectFlag { DynamicMetaObject = 0x01, RequiresVariantMetaObject = 0x02, PropertyAccessInStaticMetaCall = 0x04 // since Qt 5.5, property code is in the static metacall }; +Q_DECLARE_FLAGS(MetaObjectFlags, MetaObjectFlag) +Q_DECLARE_OPERATORS_FOR_FLAGS(MetaObjectFlags) enum MetaDataFlags { IsUnresolvedType = 0x80000000, diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index c4ea31c215..b8238a3df8 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -321,9 +321,9 @@ void QMetaObjectBuilder::setSuperClass(const QMetaObject *meta) \sa setFlags() */ -QMetaObjectBuilder::MetaObjectFlags QMetaObjectBuilder::flags() const +MetaObjectFlags QMetaObjectBuilder::flags() const { - return (QMetaObjectBuilder::MetaObjectFlags)d->flags; + return MetaObjectFlags(d->flags); } /*! diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h index d7fcf30f53..d0d4867d8b 100644 --- a/src/corelib/kernel/qmetaobjectbuilder_p.h +++ b/src/corelib/kernel/qmetaobjectbuilder_p.h @@ -58,6 +58,7 @@ #include <QtCore/qhash.h> #include <QtCore/qmap.h> +#include <private/qmetaobject_p.h> QT_BEGIN_NAMESPACE @@ -93,14 +94,6 @@ public: }; Q_DECLARE_FLAGS(AddMembers, AddMember) - // ### TODO Qt6: remove me and use the MetaObjectFlags enum from qmetaobject_p.h - enum MetaObjectFlag { // keep it in sync with enum MetaObjectFlags from qmetaobject_p.h - DynamicMetaObject = 0x01, - RequiresVariantMetaObject = 0x02, - PropertyAccessInStaticMetaCall = 0x04 // since Qt 5.5, property code is in the static metacall - }; - Q_DECLARE_FLAGS(MetaObjectFlags, MetaObjectFlag) - QMetaObjectBuilder(); explicit QMetaObjectBuilder(const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members = AllMembers); virtual ~QMetaObjectBuilder(); @@ -350,7 +343,6 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QMetaObjectBuilder::AddMembers) -Q_DECLARE_OPERATORS_FOR_FLAGS(QMetaObjectBuilder::MetaObjectFlags) QT_END_NAMESPACE |