From e17c89f4ce74e5699ed50dc2187a39d8990316c4 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 26 Feb 2018 17:34:27 +0100 Subject: use the override keyword consistently and correctly (clang-tidy) Change-Id: If9e28d143f8cba3df3c757476b4f2265e2eb8b2a Reviewed-by: Johan Helsing --- src/qml/qml/qqmlapplicationengine.h | 2 +- src/qml/qml/qqmlbinding_p.h | 2 +- src/qml/qml/qqmlboundsignal_p.h | 2 +- src/qml/qml/qqmlcomponent.h | 2 +- src/qml/qml/qqmlcontext.h | 2 +- src/qml/qml/qqmldelayedcallqueue_p.h | 2 +- src/qml/qml/qqmlengine.h | 2 +- src/qml/qml/qqmlengine_p.h | 4 ++-- src/qml/qml/qqmlexpression.h | 2 +- src/qml/qml/qqmlexpression_p.h | 2 +- src/qml/qml/qqmlextensioninterface.h | 2 +- src/qml/qml/qqmlextensionplugin.h | 2 +- src/qml/qml/qqmlfileselector.h | 2 +- src/qml/qml/qqmlopenmetaobject_p.h | 4 ++-- src/qml/qml/qqmlprivate.h | 2 +- src/qml/qml/qqmlpropertycache_p.h | 2 +- src/qml/qml/qqmltypeloader_p.h | 10 +++++----- src/qml/qml/qqmltypenamecache_p.h | 2 +- src/qml/qml/qqmlvaluetype_p.h | 2 +- src/qml/qml/qqmlvmemetaobject_p.h | 6 +++--- 20 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/qqmlapplicationengine.h b/src/qml/qml/qqmlapplicationengine.h index d0f9e6d319..bb5d6b5d68 100644 --- a/src/qml/qml/qqmlapplicationengine.h +++ b/src/qml/qml/qqmlapplicationengine.h @@ -56,7 +56,7 @@ public: QQmlApplicationEngine(QObject *parent = nullptr); QQmlApplicationEngine(const QUrl &url, QObject *parent = nullptr); QQmlApplicationEngine(const QString &filePath, QObject *parent = nullptr); - ~QQmlApplicationEngine(); + ~QQmlApplicationEngine() override; #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QList rootObjects(); // ### Qt 6: remove diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h index 8bc9554a42..19ec3f5d4f 100644 --- a/src/qml/qml/qqmlbinding_p.h +++ b/src/qml/qml/qqmlbinding_p.h @@ -79,7 +79,7 @@ public: QObject *obj, QQmlContextData *ctxt, QV4::ExecutionContext *scope); static QQmlBinding *createTranslationBinding(QV4::CompiledData::CompilationUnit *unit, const QV4::CompiledData::Binding *binding, QObject *obj, QQmlContextData *ctxt); - ~QQmlBinding(); + ~QQmlBinding() override; void setTarget(const QQmlProperty &); void setTarget(QObject *, const QQmlPropertyData &, const QQmlPropertyData *valueType); diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index d3e584fd13..01094a11f7 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -92,7 +92,7 @@ public: QQmlEngine *engine() const { return context() ? context()->engine : nullptr; } private: - ~QQmlBoundSignalExpression(); + ~QQmlBoundSignalExpression() override; void init(QQmlContextData *ctxt, QObject *scope); diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h index b8cc556e4a..444b3ec46c 100644 --- a/src/qml/qml/qqmlcomponent.h +++ b/src/qml/qml/qqmlcomponent.h @@ -83,7 +83,7 @@ public: QQmlComponent(QQmlEngine *, const QString &fileName, CompilationMode mode, QObject *parent = nullptr); QQmlComponent(QQmlEngine *, const QUrl &url, QObject *parent = nullptr); QQmlComponent(QQmlEngine *, const QUrl &url, CompilationMode mode, QObject *parent = nullptr); - virtual ~QQmlComponent(); + ~QQmlComponent() override; enum Status { Null, Ready, Loading, Error }; Q_ENUM(Status) diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h index 506ae216b2..7ed70c7619 100644 --- a/src/qml/qml/qqmlcontext.h +++ b/src/qml/qml/qqmlcontext.h @@ -68,7 +68,7 @@ public: QQmlContext(QQmlEngine *parent, QObject *objParent = nullptr); QQmlContext(QQmlContext *parent, QObject *objParent = nullptr); - virtual ~QQmlContext(); + ~QQmlContext() override; bool isValid() const; diff --git a/src/qml/qml/qqmldelayedcallqueue_p.h b/src/qml/qml/qqmldelayedcallqueue_p.h index 47e211829c..7962318561 100644 --- a/src/qml/qml/qqmldelayedcallqueue_p.h +++ b/src/qml/qml/qqmldelayedcallqueue_p.h @@ -65,7 +65,7 @@ class QQmlDelayedCallQueue : public QObject Q_OBJECT public: QQmlDelayedCallQueue(); - ~QQmlDelayedCallQueue(); + ~QQmlDelayedCallQueue() override; void init(QV4::ExecutionEngine *); diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 937920e191..73ad2754c8 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -97,7 +97,7 @@ class Q_QML_EXPORT QQmlEngine : public QJSEngine Q_OBJECT public: explicit QQmlEngine(QObject *p = nullptr); - virtual ~QQmlEngine(); + ~QQmlEngine() override; QQmlContext *rootContext() const; diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 2dfbd42e57..d6110c6699 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -122,7 +122,7 @@ class Q_QML_PRIVATE_EXPORT QQmlEnginePrivate : public QJSEnginePrivate Q_DECLARE_PUBLIC(QQmlEngine) public: QQmlEnginePrivate(QQmlEngine *); - ~QQmlEnginePrivate(); + ~QQmlEnginePrivate() override; void init(); // No mutex protecting baseModulesUninitialized, because use outside QQmlEngine @@ -341,7 +341,7 @@ void QQmlEnginePrivate::deleteInEngineThread(T *value) } else { struct I : public Deletable { I(T *value) : value(value) {} - ~I() { delete value; } + ~I() override { delete value; } T *value; }; I *i = new I(value); diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h index e9c8770e92..0eceeb12e1 100644 --- a/src/qml/qml/qqmlexpression.h +++ b/src/qml/qml/qqmlexpression.h @@ -62,7 +62,7 @@ public: QQmlExpression(); QQmlExpression(QQmlContext *, QObject *, const QString &, QObject * = nullptr); explicit QQmlExpression(const QQmlScriptString &, QQmlContext * = nullptr, QObject * = nullptr, QObject * = nullptr); - virtual ~QQmlExpression(); + ~QQmlExpression() override; QQmlEngine *engine() const; QQmlContext *context() const; diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h index 55059575e1..da10b31b2c 100644 --- a/src/qml/qml/qqmlexpression_p.h +++ b/src/qml/qml/qqmlexpression_p.h @@ -68,7 +68,7 @@ class QQmlExpressionPrivate : public QObjectPrivate, Q_DECLARE_PUBLIC(QQmlExpression) public: QQmlExpressionPrivate(); - ~QQmlExpressionPrivate(); + ~QQmlExpressionPrivate() override; void init(QQmlContextData *, const QString &, QObject *); void init(QQmlContextData *, QV4::Function *runtimeFunction, QObject *); diff --git a/src/qml/qml/qqmlextensioninterface.h b/src/qml/qml/qqmlextensioninterface.h index 62b9b26569..c2d20ef0a3 100644 --- a/src/qml/qml/qqmlextensioninterface.h +++ b/src/qml/qml/qqmlextensioninterface.h @@ -58,7 +58,7 @@ public: class Q_QML_EXPORT QQmlExtensionInterface : public QQmlTypesExtensionInterface { public: - virtual ~QQmlExtensionInterface() {} + ~QQmlExtensionInterface() override {} virtual void initializeEngine(QQmlEngine *engine, const char *uri) = 0; }; diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h index 84a46fb93e..55e9b89dae 100644 --- a/src/qml/qml/qqmlextensionplugin.h +++ b/src/qml/qml/qqmlextensionplugin.h @@ -59,7 +59,7 @@ class Q_QML_EXPORT QQmlExtensionPlugin Q_INTERFACES(QQmlTypesExtensionInterface) public: explicit QQmlExtensionPlugin(QObject *parent = nullptr); - ~QQmlExtensionPlugin(); + ~QQmlExtensionPlugin() override; QUrl baseUrl() const; diff --git a/src/qml/qml/qqmlfileselector.h b/src/qml/qml/qqmlfileselector.h index 4eaf92c918..9b70e3936d 100644 --- a/src/qml/qml/qqmlfileselector.h +++ b/src/qml/qml/qqmlfileselector.h @@ -55,7 +55,7 @@ class Q_QML_EXPORT QQmlFileSelector : public QObject Q_DECLARE_PRIVATE(QQmlFileSelector) public: explicit QQmlFileSelector(QQmlEngine *engine, QObject *parent = nullptr); - ~QQmlFileSelector(); + ~QQmlFileSelector() override; QFileSelector *selector() const Q_DECL_NOTHROW; void setSelector(QFileSelector *selector); void setExtraSelectors(QStringList &strings); // TODO Qt6: remove diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h index bb5477dfbf..4905190b75 100644 --- a/src/qml/qml/qqmlopenmetaobject_p.h +++ b/src/qml/qml/qqmlopenmetaobject_p.h @@ -69,7 +69,7 @@ class Q_QML_PRIVATE_EXPORT QQmlOpenMetaObjectType : public QQmlRefCount, public { public: QQmlOpenMetaObjectType(const QMetaObject *base, QQmlEngine *engine); - ~QQmlOpenMetaObjectType(); + ~QQmlOpenMetaObjectType() override; void createProperties(const QVector &names); int createProperty(const QByteArray &name); @@ -97,7 +97,7 @@ class Q_QML_PRIVATE_EXPORT QQmlOpenMetaObject : public QAbstractDynamicMetaObjec public: QQmlOpenMetaObject(QObject *, const QMetaObject * = nullptr, bool = true); QQmlOpenMetaObject(QObject *, QQmlOpenMetaObjectType *, bool = true); - ~QQmlOpenMetaObject(); + ~QQmlOpenMetaObject() override; QVariant value(const QByteArray &) const; bool setValue(const QByteArray &, const QVariant &); diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h index 11adea6fc9..fabdcacc36 100644 --- a/src/qml/qml/qqmlprivate.h +++ b/src/qml/qml/qqmlprivate.h @@ -98,7 +98,7 @@ namespace QQmlPrivate class QQmlElement : public T { public: - virtual ~QQmlElement() { + ~QQmlElement() override { QQmlPrivate::qdeclarativeelement_destructor(this); } }; diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 7b04ba11b8..51a191a41f 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -394,7 +394,7 @@ class Q_QML_PRIVATE_EXPORT QQmlPropertyCache : public QQmlRefCount public: QQmlPropertyCache(); QQmlPropertyCache(const QMetaObject *); - virtual ~QQmlPropertyCache(); + ~QQmlPropertyCache() override; void update(const QMetaObject *); void invalidate(const QMetaObject *); diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index f2327e9a5f..713f707387 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -110,7 +110,7 @@ public: }; QQmlDataBlob(const QUrl &, Type, QQmlTypeLoader* manager); - virtual ~QQmlDataBlob(); + ~QQmlDataBlob() override; void startLoading(); @@ -262,7 +262,7 @@ public: { public: Blob(const QUrl &url, QQmlDataBlob::Type type, QQmlTypeLoader *loader); - ~Blob(); + ~Blob() override; const QQmlImports &imports() const { return m_importCache; } @@ -438,7 +438,7 @@ private: QQmlTypeData(const QUrl &, QQmlTypeLoader *); public: - ~QQmlTypeData(); + ~QQmlTypeData() override; const QList &resolvedScripts() const; @@ -523,7 +523,7 @@ private: QQmlScriptData(); public: - ~QQmlScriptData(); + ~QQmlScriptData() override; QUrl url; QString urlString; @@ -554,7 +554,7 @@ private: QQmlScriptBlob(const QUrl &, QQmlTypeLoader *); public: - ~QQmlScriptBlob(); + ~QQmlScriptBlob() override; struct ScriptReference { diff --git a/src/qml/qml/qqmltypenamecache_p.h b/src/qml/qml/qqmltypenamecache_p.h index c2f7a70d03..28b5e7f0ad 100644 --- a/src/qml/qml/qqmltypenamecache_p.h +++ b/src/qml/qml/qqmltypenamecache_p.h @@ -85,7 +85,7 @@ class Q_QML_PRIVATE_EXPORT QQmlTypeNameCache : public QQmlRefCount { public: QQmlTypeNameCache(const QQmlImports &imports); - virtual ~QQmlTypeNameCache(); + ~QQmlTypeNameCache() override; inline bool isEmpty() const; diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h index 7d8473db0e..4ea71e8955 100644 --- a/src/qml/qml/qqmlvaluetype_p.h +++ b/src/qml/qml/qqmlvaluetype_p.h @@ -67,7 +67,7 @@ class Q_QML_PRIVATE_EXPORT QQmlValueType : public QObject, public QAbstractDynam { public: QQmlValueType(int userType, const QMetaObject *metaObject); - ~QQmlValueType(); + ~QQmlValueType() override; void read(QObject *, int); void write(QObject *, int, QQmlPropertyData::WriteFlags flags); QVariant value(); diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 1da79b8a81..0c82686d47 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -81,7 +81,7 @@ class QQmlVMEVariantQObjectPtr : public QQmlGuard { public: inline QQmlVMEVariantQObjectPtr(); - inline ~QQmlVMEVariantQObjectPtr(); + inline ~QQmlVMEVariantQObjectPtr() override; inline void objectDestroyed(QObject *) override; inline void setGuardedValue(QObject *obj, QQmlVMEMetaObject *target, int index); @@ -95,7 +95,7 @@ class Q_QML_PRIVATE_EXPORT QQmlInterceptorMetaObject : public QAbstractDynamicMe { public: QQmlInterceptorMetaObject(QObject *obj, QQmlPropertyCache *cache); - ~QQmlInterceptorMetaObject(); + ~QQmlInterceptorMetaObject() override; void registerInterceptor(QQmlPropertyIndex index, QQmlPropertyValueInterceptor *interceptor); @@ -147,7 +147,7 @@ class Q_QML_PRIVATE_EXPORT QQmlVMEMetaObject : public QQmlInterceptorMetaObject { public: QQmlVMEMetaObject(QV4::ExecutionEngine *engine, QObject *obj, QQmlPropertyCache *cache, QV4::CompiledData::CompilationUnit *qmlCompilationUnit, int qmlObjectId); - ~QQmlVMEMetaObject(); + ~QQmlVMEMetaObject() override; bool aliasTarget(int index, QObject **target, int *coreIndex, int *valueTypeIndex) const; QV4::ReturnedValue vmeMethod(int index) const; -- cgit v1.2.3 From f010b360c3b9929550ee1768c0eddd2a85345da6 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 23 Feb 2018 12:29:44 +0100 Subject: Do not write JSC files when debugging These will include Debug interpreter instructions, which wreck havoc when no debugger is attached. Task-number: QTBUG-66593 Change-Id: I0692207e51df6d52d0616f37a06ade76b6b2d54a Reviewed-by: Simon Hausmann --- src/qml/qml/qqmltypeloader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index ed1526c0a9..a107bb42ce 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -3015,7 +3015,7 @@ void QQmlScriptBlob::dataReceived(const SourceCodeData &data) // The js unit owns the data and will free the qml unit. unit->data = unitData; - if (!disableDiskCache() || forceDiskCache()) { + if ((!disableDiskCache() || forceDiskCache()) && !isDebugging()) { QString errorString; if (!unit->saveToDisk(url(), &errorString)) { qCDebug(DBG_DISK_CACHE()) << "Error saving cached version of" << unit->fileName() << "to disk:" << errorString; -- cgit v1.2.3 From 622decbe3b2478496295e57d59f9cf16a9f70a13 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Wed, 28 Feb 2018 16:09:09 +0200 Subject: Silence GCC 8 warnings in qpodvector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qpodvector_p.h:90:34: error: ‘void* realloc(void*, size_t)’ moving an object of non-trivially copyable type ‘class QQuickBasePositioner::PositionedItem’; use ‘new’ and ‘delete’ instead [-Werror=class-memaccess] m_data = (T *)realloc(m_data, m_capacity * sizeof(T)); qpodvector_p.h:94:22: error: ‘void* memmove(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class QQuickBasePositioner::PositionedItem’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] ::memmove(m_data + idx + 1, m_data + idx, moveCount * sizeof(T)); Change-Id: I37088986a0f8613152a355ed6f3f9572316fa607 Reviewed-by: Simon Hausmann --- src/qml/qml/ftw/qpodvector_p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/ftw/qpodvector_p.h b/src/qml/qml/ftw/qpodvector_p.h index d0e4f89741..5255c1f617 100644 --- a/src/qml/qml/ftw/qpodvector_p.h +++ b/src/qml/qml/ftw/qpodvector_p.h @@ -87,11 +87,11 @@ public: void insert(int idx, const T &v) { if (m_count == m_capacity) { m_capacity += Increment; - m_data = (T *)realloc(m_data, m_capacity * sizeof(T)); + m_data = (T *)realloc(static_cast(m_data), m_capacity * sizeof(T)); } int moveCount = m_count - idx; if (moveCount) - ::memmove(m_data + idx + 1, m_data + idx, moveCount * sizeof(T)); + ::memmove(static_cast(m_data + idx + 1), static_cast(m_data + idx), moveCount * sizeof(T)); m_count++; m_data[idx] = v; } @@ -99,7 +99,7 @@ public: void reserve(int count) { if (count >= m_capacity) { m_capacity = (count + (Increment-1)) & (0xFFFFFFFF - Increment + 1); - m_data = (T *)realloc(m_data, m_capacity * sizeof(T)); + m_data = (T *)realloc(static_cast(m_data), m_capacity * sizeof(T)); } } @@ -108,7 +108,7 @@ public: reserve(newSize); int moveCount = m_count - idx; if (moveCount) - ::memmove(m_data + idx + count, m_data + idx, + ::memmove(static_cast(m_data + idx + count), static_cast(m_data + idx), moveCount * sizeof(T)); m_count = newSize; } -- cgit v1.2.3 From 55f71cdfc5746a71bcb89f0fa4ff3447cb8b5514 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Wed, 28 Feb 2018 16:50:44 +0200 Subject: Silence another GCC 8 warning in qpodvector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtdeclarative/src/qml/qml/ftw/qpodvector_p.h:119:22: error: ‘void* memmove(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class QQuickBasePositioner::PositionedItem’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] ::memmove(m_data + idx, m_data + idx + count, Change-Id: I049703a0a6bb4432dfd3d3ce3c8cef13e9c2e31a Reviewed-by: Simon Hausmann --- src/qml/qml/ftw/qpodvector_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/ftw/qpodvector_p.h b/src/qml/qml/ftw/qpodvector_p.h index 5255c1f617..b2fb481793 100644 --- a/src/qml/qml/ftw/qpodvector_p.h +++ b/src/qml/qml/ftw/qpodvector_p.h @@ -116,7 +116,7 @@ public: void remove(int idx, int count = 1) { int moveCount = m_count - (idx + count); if (moveCount) - ::memmove(m_data + idx, m_data + idx + count, + ::memmove(static_cast(m_data + idx), static_cast(m_data + idx + count), moveCount * sizeof(T)); m_count -= count; } -- cgit v1.2.3