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.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.h')
-rw-r--r-- | src/corelib/kernel/qmetaobject.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 686e4aeeb8..629d6c1891 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -175,7 +175,7 @@ public: { typedef QtPrivate::FunctionPointer<PointerToMemberFunction> SignalType; static_assert(QtPrivate::HasQ_OBJECT_Macro<typename SignalType::Object>::Value, - "No Q_OBJECT in the class with the signal"); + "No Q_OBJECT in the class with the signal"); return fromSignalImpl(&SignalType::Object::staticMetaObject, reinterpret_cast<void **>(&signal)); } @@ -235,18 +235,20 @@ public: const char *scope() const; int keyToValue(const char *key, bool *ok = nullptr) const; - const char* valueToKey(int value) const; - int keysToValue(const char * keys, bool *ok = nullptr) const; + const char *valueToKey(int value) const; + int keysToValue(const char *keys, bool *ok = nullptr) const; QByteArray valueToKeys(int value) const; inline const QMetaObject *enclosingMetaObject() const { return mobj; } inline bool isValid() const { return name() != nullptr; } - template<typename T> static QMetaEnum fromType() { + template<typename T> + static QMetaEnum fromType() + { static_assert(QtPrivate::IsQEnumHelper<T>::Value, - "QMetaEnum::fromType only works with enums declared as " - "Q_ENUM, Q_ENUM_NS, Q_FLAG or Q_FLAG_NS"); + "QMetaEnum::fromType only works with enums declared as " + "Q_ENUM, Q_ENUM_NS, Q_FLAG or Q_FLAG_NS"); const QMetaObject *metaObject = qt_getEnumMetaObject(T()); const char *name = qt_getEnumName(T()); return metaObject->enumerator(metaObject->indexOfEnumerator(name)); @@ -363,6 +365,7 @@ public: const char *name() const; const char *value() const; inline const QMetaObject *enclosingMetaObject() const { return mobj; } + private: struct Data { enum { Size = 2 }; |