diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-20 10:13:49 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-24 19:45:59 +0200 |
commit | c2cf5f824a09adf0362f015c1b9d1817dabb04c3 (patch) | |
tree | 54cb2e3bf0bc02d86ccf8f0e8286daaf7092fe59 /src/corelib/kernel/qmetaobject_p.h | |
parent | c4245e7b8ceb233a06cea1ace9439795738adbf8 (diff) |
Whitespace cleanup in corelib/kernel
Change-Id: If061ef0af5ced4384e20a82afcea3712fa7e45d7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetaobject_p.h')
-rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 74136c3f6f..574acafd1f 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -65,14 +65,14 @@ QT_BEGIN_NAMESPACE // ### TODO Qt6: add a proper namespace with Q_NAMESPACE and use scoped enums // A namespace and scoped are needed to avoid enum clashes -enum PropertyFlags { +enum PropertyFlags { Invalid = 0x00000000, Readable = 0x00000001, Writable = 0x00000002, Resettable = 0x00000004, EnumOrFlag = 0x00000008, Alias = 0x00000010, - //Reserved for future usage = 0x00000020, + // Reserved for future usage = 0x00000020, StdCppSet = 0x00000100, Constant = 0x00000400, Final = 0x00000800, @@ -84,11 +84,11 @@ enum PropertyFlags { Bindable = 0x02000000 }; -enum MethodFlags { +enum MethodFlags { AccessPrivate = 0x00, AccessProtected = 0x01, AccessPublic = 0x02, - AccessMask = 0x03, //mask + AccessMask = 0x03, // mask MethodMethod = 0x00, MethodSignal = 0x04, @@ -174,7 +174,7 @@ struct QMetaObjectPrivate // revision 8 is Qt 5.12: It adds the enum name to QMetaEnum // revision 9 is Qt 6.0: It adds the metatype of properties and methods enum { OutputRevision = 9 }; // Used by moc, qmetaobjectbuilder and qdbus - enum { IntsPerMethod = QMetaMethod::Data::Size}; + enum { IntsPerMethod = QMetaMethod::Data::Size }; enum { IntsPerEnum = QMetaEnum::Data::Size }; enum { IntsPerProperty = QMetaProperty::Data::Size }; @@ -210,11 +210,12 @@ struct QMetaObjectPrivate static int indexOfConstructor(const QMetaObject *m, const QByteArray &name, int argc, const QArgumentType *types); Q_CORE_EXPORT static QMetaMethod signal(const QMetaObject *m, int signal_index); - static inline int signalOffset(const QMetaObject *m) { + static inline int signalOffset(const QMetaObject *m) + { Q_ASSERT(m != nullptr); int offset = 0; for (m = m->d.superdata; m; m = m->d.superdata) - offset += reinterpret_cast<const QMetaObjectPrivate*>(m->d.data)->signalCount; + offset += reinterpret_cast<const QMetaObjectPrivate *>(m->d.data)->signalCount; return offset; } Q_CORE_EXPORT static int absoluteSignalCount(const QMetaObject *m); @@ -227,7 +228,7 @@ struct QMetaObjectPrivate static QList<QByteArray> parameterTypeNamesFromSignature(const char *signature); #ifndef QT_NO_QOBJECT - //defined in qobject.cpp + // defined in qobject.cpp enum DisconnectType { DisconnectAll, DisconnectOne }; static void memberIndexes(const QObject *obj, const QMetaMethod &member, int *signalIndex, int *methodIndex); |