diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-09-20 13:17:10 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-09-20 20:18:06 +0200 |
| commit | bf5d5bfc0ce8a1cfddaf954eb0c5225be4f429a5 (patch) | |
| tree | c55bb9793b7a4af37484b7e5aa9e3851891cf3dd /src | |
| parent | b32698b3a9ffdae5e3995a390c804cfe2c8b7943 (diff) | |
QScoped(Array)Pointer: use the rule of 5
CodeChecker complains regarding the two classes not having all
the special 5 declared, so do it.
Change-Id: I76d562c52f89a24aec9f155c2be62f8844f1f4a7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 43e0718699..c9afb248a1 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -219,7 +219,7 @@ protected: T *d; private: - Q_DISABLE_COPY(QScopedPointer) + Q_DISABLE_COPY_MOVE(QScopedPointer) }; template <typename T, typename Cleanup = QScopedPointerArrayDeleter<T> > @@ -229,6 +229,7 @@ class [[nodiscard]] QScopedArrayPointer : public QScopedPointer<T, Cleanup> using if_same_type = typename std::enable_if<std::is_same<typename std::remove_cv<T>::type, Ptr>::value, bool>::type; public: inline QScopedArrayPointer() : QScopedPointer<T, Cleanup>(nullptr) {} + inline ~QScopedArrayPointer() = default; template <typename D, if_same_type<D> = true> explicit QScopedArrayPointer(D *p) @@ -265,7 +266,7 @@ private: // allowed and results in undefined behavior. } - Q_DISABLE_COPY(QScopedArrayPointer) + Q_DISABLE_COPY_MOVE(QScopedArrayPointer) }; #if QT_DEPRECATED_SINCE(6, 2) |