diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-26 16:57:36 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-28 12:27:44 +0200 |
commit | f28b48b90e3230d1ce6bbcd5031ecb50089ec12b (patch) | |
tree | 8a63d5e4fdb7b9648e21d55bdbf4f485c98283da /src/qml | |
parent | 467be7ed0954618eee19d90f758f51c10802c9be (diff) |
Fix -Wdeprecated-copy warnings
Mostly by avoiding custom functions when the compiler generated ones
work just fine
Change-Id: If8152fd24c9084bd85be3741fc218709e50fc375
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 8 | ||||
-rw-r--r-- | src/qml/qml/qqmltypenamecache_p.h | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index 12a6381e6f..beb8315225 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -172,6 +172,9 @@ private: struct ScopedValue { + ScopedValue(const ScopedValue &) = default; + ScopedValue(ScopedValue &&) = default; + ScopedValue(const Scope &scope) { ptr = scope.alloc<Scope::Uninitialized>(); @@ -381,11 +384,6 @@ struct Scoped return *this; } - Scoped<T> &operator=(const Scoped<T> &other) { - *ptr = *other.ptr; - return *this; - } - Scoped<T> &operator=(T *t) { setPointer(t); return *this; diff --git a/src/qml/qml/qqmltypenamecache_p.h b/src/qml/qml/qqmltypenamecache_p.h index b98fe77ed5..41cb61a9ac 100644 --- a/src/qml/qml/qqmltypenamecache_p.h +++ b/src/qml/qml/qqmltypenamecache_p.h @@ -98,7 +98,6 @@ public: inline Result(const QQmlImportRef *importNamespace); inline Result(const QQmlType &type); inline Result(int scriptIndex); - inline Result(const Result &); inline bool isValid() const; @@ -182,11 +181,6 @@ QQmlTypeNameCache::Result::Result(int scriptIndex) { } -QQmlTypeNameCache::Result::Result(const Result &o) -: type(o.type), importNamespace(o.importNamespace), scriptIndex(o.scriptIndex) -{ -} - bool QQmlTypeNameCache::Result::isValid() const { return type.isValid() || importNamespace || scriptIndex != -1; |