diff options
author | Tim Blechmann <tim@klingt.org> | 2022-10-06 19:24:47 +0800 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-16 06:47:31 +0000 |
commit | 0b1464f6d0c86c13019db3e97f1e4d118e54c782 (patch) | |
tree | c96a4a667d34c267896fb11cbeb9331576e4d571 /src | |
parent | 7e0bc47335b7f64c8bc0da7447e5a0e468dd7c32 (diff) |
qml: silence -Wextra-semi
silence gcc's -Wextra-semi. the private headers are pulled in via the
type compiler
Change-Id: I5291d007c379f522c2dae9d814c4f4cc6a7d118a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 6b9c5f6ed7b768dc918feac76bf40cdffb72bfe7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
23 files changed, 28 insertions, 28 deletions
diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h index 2edb73f7b0..ec14ebd48e 100644 --- a/src/qml/common/qv4compileddata_p.h +++ b/src/qml/common/qv4compileddata_p.h @@ -1047,8 +1047,8 @@ public: InlineComponentIterator inlineComponentsEnd() const {return InlineComponentIterator(this, nInlineComponents);} typedef TableIterator<RequiredPropertyExtraData, Object, &Object::requiredPropertyExtraDataAt> RequiredPropertyExtraDataIterator; - RequiredPropertyExtraDataIterator requiredPropertyExtraDataBegin() const {return RequiredPropertyExtraDataIterator(this, 0); }; - RequiredPropertyExtraDataIterator requiredPropertyExtraDataEnd() const {return RequiredPropertyExtraDataIterator(this, nRequiredPropertyExtraData); }; + RequiredPropertyExtraDataIterator requiredPropertyExtraDataBegin() const {return RequiredPropertyExtraDataIterator(this, 0); } + RequiredPropertyExtraDataIterator requiredPropertyExtraDataEnd() const {return RequiredPropertyExtraDataIterator(this, nRequiredPropertyExtraData); } int namedObjectsInComponentCount() const { return nNamedObjectsInComponent; } // --- diff --git a/src/qml/jsruntime/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h index 4edfe2a763..dc17ea4e54 100644 --- a/src/qml/jsruntime/qv4argumentsobject_p.h +++ b/src/qml/jsruntime/qv4argumentsobject_p.h @@ -30,7 +30,7 @@ namespace Heap { Member(class, NoMark, quint64, mapped) DECLARE_HEAP_OBJECT(ArgumentsObject, Object) { - DECLARE_MARKOBJECTS(ArgumentsObject); + DECLARE_MARKOBJECTS(ArgumentsObject) enum { LengthPropertyIndex = 0, SymbolIteratorPropertyIndex = 1, diff --git a/src/qml/jsruntime/qv4arrayiterator_p.h b/src/qml/jsruntime/qv4arrayiterator_p.h index 2682dc79d0..ff00f99bea 100644 --- a/src/qml/jsruntime/qv4arrayiterator_p.h +++ b/src/qml/jsruntime/qv4arrayiterator_p.h @@ -33,7 +33,7 @@ namespace Heap { Member(class, NoMark, quint32, nextIndex) DECLARE_HEAP_OBJECT(ArrayIteratorObject, Object) { - DECLARE_MARKOBJECTS(ArrayIteratorObject); + DECLARE_MARKOBJECTS(ArrayIteratorObject) void init(Object *obj, QV4::ExecutionEngine *engine) { Object::init(); diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 66f06ff96a..82a9472223 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -29,7 +29,7 @@ namespace Heap { Member(class, Pointer, Object *, activation) DECLARE_HEAP_OBJECT(ExecutionContext, Base) { - DECLARE_MARKOBJECTS(ExecutionContext); + DECLARE_MARKOBJECTS(ExecutionContext) enum ContextType { Type_GlobalContext = 0x1, @@ -68,7 +68,7 @@ Q_STATIC_ASSERT(offsetof(ExecutionContextData, activation) == offsetof(Execution Member(class, ValueArray, ValueArray, locals) DECLARE_HEAP_OBJECT(CallContext, ExecutionContext) { - DECLARE_MARKOBJECTS(CallContext); + DECLARE_MARKOBJECTS(CallContext) void init() { diff --git a/src/qml/jsruntime/qv4dataview_p.h b/src/qml/jsruntime/qv4dataview_p.h index 73f31d8f8c..ab2e1e589a 100644 --- a/src/qml/jsruntime/qv4dataview_p.h +++ b/src/qml/jsruntime/qv4dataview_p.h @@ -33,7 +33,7 @@ struct DataViewCtor : FunctionObject { Member(class, NoMark, uint, byteOffset) DECLARE_HEAP_OBJECT(DataView, Object) { - DECLARE_MARKOBJECTS(DataView); + DECLARE_MARKOBJECTS(DataView) void init() { Object::init(); } }; diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h index c8ebe11f30..3d9069b587 100644 --- a/src/qml/jsruntime/qv4errorobject_p.h +++ b/src/qml/jsruntime/qv4errorobject_p.h @@ -31,7 +31,7 @@ namespace Heap { Member(class, Pointer, String *, stack) DECLARE_HEAP_OBJECT(ErrorObject, Object) { - DECLARE_MARKOBJECTS(ErrorObject); + DECLARE_MARKOBJECTS(ErrorObject) enum ErrorType { Error, EvalError, diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index b42c55f5a8..e32fce28ba 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -40,7 +40,7 @@ namespace Heap { Member(class, NoMark, bool, canBeTailCalled) DECLARE_HEAP_OBJECT(FunctionObject, Object) { - DECLARE_MARKOBJECTS(FunctionObject); + DECLARE_MARKOBJECTS(FunctionObject) enum { Index_ProtoConstructor = 0, Index_Prototype = 0, @@ -125,7 +125,7 @@ struct DefaultClassConstructorFunction : FunctionObject Member(class, Pointer, MemberData *, boundArgs) DECLARE_HEAP_OBJECT(BoundFunction, FunctionObject) { - DECLARE_MARKOBJECTS(BoundFunction); + DECLARE_MARKOBJECTS(BoundFunction) void init(QV4::ExecutionContext *scope, QV4::FunctionObject *target, const Value &boundThis, QV4::MemberData *boundArgs); }; diff --git a/src/qml/jsruntime/qv4generatorobject_p.h b/src/qml/jsruntime/qv4generatorobject_p.h index 4a84bec748..55ccc133aa 100644 --- a/src/qml/jsruntime/qv4generatorobject_p.h +++ b/src/qml/jsruntime/qv4generatorobject_p.h @@ -57,7 +57,7 @@ struct GeneratorPrototype : FunctionObject { Member(class, Pointer, ArrayObject *, jsFrame) DECLARE_HEAP_OBJECT(GeneratorObject, Object) { - DECLARE_MARKOBJECTS(GeneratorObject); + DECLARE_MARKOBJECTS(GeneratorObject) }; } diff --git a/src/qml/jsruntime/qv4mapiterator_p.h b/src/qml/jsruntime/qv4mapiterator_p.h index 2269473d4c..97a72db85c 100644 --- a/src/qml/jsruntime/qv4mapiterator_p.h +++ b/src/qml/jsruntime/qv4mapiterator_p.h @@ -30,7 +30,7 @@ namespace Heap { Member(class, NoMark, quint32, mapNextIndex) DECLARE_HEAP_OBJECT(MapIteratorObject, Object) { - DECLARE_MARKOBJECTS(MapIteratorObject); + DECLARE_MARKOBJECTS(MapIteratorObject) void init(Object *obj, QV4::ExecutionEngine *engine) { Object::init(); diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h index adcd1e8cf9..672b058fef 100644 --- a/src/qml/jsruntime/qv4memberdata_p.h +++ b/src/qml/jsruntime/qv4memberdata_p.h @@ -27,7 +27,7 @@ namespace Heap { Member(class, ValueArray, ValueArray, values) DECLARE_HEAP_OBJECT(MemberData, Base) { - DECLARE_MARKOBJECTS(MemberData); + DECLARE_MARKOBJECTS(MemberData) }; Q_STATIC_ASSERT(std::is_trivial_v<MemberData>); diff --git a/src/qml/jsruntime/qv4persistent_p.h b/src/qml/jsruntime/qv4persistent_p.h index e7b653b6f6..7e208bd4fd 100644 --- a/src/qml/jsruntime/qv4persistent_p.h +++ b/src/qml/jsruntime/qv4persistent_p.h @@ -69,7 +69,7 @@ public: PersistentValue(PersistentValue &&other) noexcept : val(std::exchange(other.val, nullptr)) {} void swap(PersistentValue &other) noexcept { qt_ptr_swap(val, other.val); } - QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(PersistentValue); + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(PersistentValue) ~PersistentValue() { PersistentValueStorage::free(val); } PersistentValue &operator=(const WeakValue &other); diff --git a/src/qml/jsruntime/qv4qmlcontext_p.h b/src/qml/jsruntime/qv4qmlcontext_p.h index a89e7f6f2f..bd4b5c2585 100644 --- a/src/qml/jsruntime/qv4qmlcontext_p.h +++ b/src/qml/jsruntime/qv4qmlcontext_p.h @@ -34,7 +34,7 @@ namespace Heap { Member(class, Pointer, Module *, module) DECLARE_HEAP_OBJECT(QQmlContextWrapper, Object) { - DECLARE_MARKOBJECTS(QQmlContextWrapper); + DECLARE_MARKOBJECTS(QQmlContextWrapper) void init(QQmlRefPointer<QQmlContextData> context, QObject *scopeObject); void destroy(); @@ -47,7 +47,7 @@ DECLARE_HEAP_OBJECT(QQmlContextWrapper, Object) { #define QmlContextMembers(class, Member) DECLARE_HEAP_OBJECT(QmlContext, ExecutionContext) { - DECLARE_MARKOBJECTS(QmlContext); + DECLARE_MARKOBJECTS(QmlContext) QQmlContextWrapper *qml() { return static_cast<QQmlContextWrapper *>(activation.get()); } void init(QV4::ExecutionContext *outerContext, QV4::QQmlContextWrapper *qml); diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h index a4aac8ec21..5a0d837746 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper_p.h +++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h @@ -65,7 +65,7 @@ private: Member(class, NoMark, int, index) DECLARE_HEAP_OBJECT(QObjectMethod, FunctionObject) { - DECLARE_MARKOBJECTS(QObjectMethod); + DECLARE_MARKOBJECTS(QObjectMethod) QQmlPropertyData *methods; int methodCount; diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h index 2f278f70a7..3171367351 100644 --- a/src/qml/jsruntime/qv4regexpobject_p.h +++ b/src/qml/jsruntime/qv4regexpobject_p.h @@ -56,7 +56,7 @@ DECLARE_HEAP_OBJECT(RegExpObject, Object) { Member(class, NoMark, int, lastMatchEnd) DECLARE_HEAP_OBJECT(RegExpCtor, FunctionObject) { - DECLARE_MARKOBJECTS(RegExpCtor); + DECLARE_MARKOBJECTS(RegExpCtor) void init(QV4::ExecutionContext *scope); void clearLastMatch(); diff --git a/src/qml/jsruntime/qv4setiterator_p.h b/src/qml/jsruntime/qv4setiterator_p.h index e7ab85accb..37f912e01a 100644 --- a/src/qml/jsruntime/qv4setiterator_p.h +++ b/src/qml/jsruntime/qv4setiterator_p.h @@ -30,7 +30,7 @@ namespace Heap { Member(class, NoMark, quint32, setNextIndex) DECLARE_HEAP_OBJECT(SetIteratorObject, Object) { - DECLARE_MARKOBJECTS(SetIteratorObject); + DECLARE_MARKOBJECTS(SetIteratorObject) void init(Object *obj, QV4::ExecutionEngine *engine) { Object::init(); diff --git a/src/qml/jsruntime/qv4stringiterator_p.h b/src/qml/jsruntime/qv4stringiterator_p.h index a445381ba6..742b8a895d 100644 --- a/src/qml/jsruntime/qv4stringiterator_p.h +++ b/src/qml/jsruntime/qv4stringiterator_p.h @@ -30,7 +30,7 @@ namespace Heap { Member(class, NoMark, quint32, nextIndex) DECLARE_HEAP_OBJECT(StringIteratorObject, Object) { - DECLARE_MARKOBJECTS(StringIteratorObject); + DECLARE_MARKOBJECTS(StringIteratorObject) void init(String *str, QV4::ExecutionEngine *engine) { Object::init(); diff --git a/src/qml/jsruntime/qv4stringobject_p.h b/src/qml/jsruntime/qv4stringobject_p.h index e0c0e37815..451a989ef4 100644 --- a/src/qml/jsruntime/qv4stringobject_p.h +++ b/src/qml/jsruntime/qv4stringobject_p.h @@ -28,7 +28,7 @@ namespace Heap { Member(class, Pointer, String *, string) DECLARE_HEAP_OBJECT(StringObject, Object) { - DECLARE_MARKOBJECTS(StringObject); + DECLARE_MARKOBJECTS(StringObject) enum { LengthPropertyIndex = 0 diff --git a/src/qml/jsruntime/qv4symbol_p.h b/src/qml/jsruntime/qv4symbol_p.h index b85ddb3b36..e56510bd69 100644 --- a/src/qml/jsruntime/qv4symbol_p.h +++ b/src/qml/jsruntime/qv4symbol_p.h @@ -36,7 +36,7 @@ struct Symbol : StringOrSymbol { Member(class, Pointer, Symbol *, symbol) DECLARE_HEAP_OBJECT(SymbolObject, Object) { - DECLARE_MARKOBJECTS(SymbolObject); + DECLARE_MARKOBJECTS(SymbolObject) void init(const QV4::Symbol *s); }; diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h index d7e9d7466c..0284dceb7b 100644 --- a/src/qml/jsruntime/qv4typedarray_p.h +++ b/src/qml/jsruntime/qv4typedarray_p.h @@ -80,7 +80,7 @@ namespace Heap { Member(class, NoMark, uint, arrayType) DECLARE_HEAP_OBJECT(TypedArray, Object) { - DECLARE_MARKOBJECTS(TypedArray); + DECLARE_MARKOBJECTS(TypedArray) using Type = TypedArrayType; void init(Type t); diff --git a/src/qml/jsruntime/qv4urlobject_p.h b/src/qml/jsruntime/qv4urlobject_p.h index 3b210547b3..e4a3ba073b 100644 --- a/src/qml/jsruntime/qv4urlobject_p.h +++ b/src/qml/jsruntime/qv4urlobject_p.h @@ -41,7 +41,7 @@ namespace Heap { DECLARE_HEAP_OBJECT(UrlObject, Object) { - DECLARE_MARKOBJECTS(UrlObject); + DECLARE_MARKOBJECTS(UrlObject) void init() { Object::init(); } }; @@ -59,7 +59,7 @@ struct UrlCtor : FunctionObject DECLARE_HEAP_OBJECT(UrlSearchParamsObject, Object) { - DECLARE_MARKOBJECTS(UrlSearchParamsObject); + DECLARE_MARKOBJECTS(UrlSearchParamsObject) void init() { Object::init(); } }; diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 518426151e..3e9e124f4d 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1280,7 +1280,7 @@ namespace Heap { Member(class, NoMark, QV4QPointer<QObject>, parent) DECLARE_HEAP_OBJECT(QmlIncubatorObject, Object) { - DECLARE_MARKOBJECTS(QmlIncubatorObject); + DECLARE_MARKOBJECTS(QmlIncubatorObject) void init(QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous); inline void destroy(); diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h index 4d4e1d0ebf..0878034bab 100644 --- a/src/qml/qml/qqmlproperty.h +++ b/src/qml/qml/qqmlproperty.h @@ -56,7 +56,7 @@ public: QQmlProperty &operator=(const QQmlProperty &); QQmlProperty(QQmlProperty &&other) noexcept : d(std::exchange(other.d, nullptr)) {} - QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QQmlProperty); + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QQmlProperty) void swap(QQmlProperty &other) noexcept { qt_ptr_swap(d, other.d); } bool operator==(const QQmlProperty &) const; diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 4d3ba7df24..68f290030d 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1621,7 +1621,7 @@ struct QQmlXMLHttpRequestWrapper : Object { Member(class, Pointer, Object *, proto) DECLARE_HEAP_OBJECT(QQmlXMLHttpRequestCtor, FunctionObject) { - DECLARE_MARKOBJECTS(QQmlXMLHttpRequestCtor); + DECLARE_MARKOBJECTS(QQmlXMLHttpRequestCtor) void init(ExecutionEngine *engine); }; |