From af8505f46819d6132b373b99c77c7c7b5836ff79 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 9 Feb 2023 13:39:06 +0200 Subject: [PATCH] Remove Q_DISABLE_MOVE macro. Q_DISABLE_MOVE was deprecated. --- src/libs/qmuparser/qmudef.h | 9 ++++----- src/libs/vdxf/libdxfrw/drw_base.h | 9 ++++----- src/libs/vmisc/defglobal.h | 9 ++++----- src/libs/vpropertyexplorer/vpropertyexplorer_global.h | 9 ++++----- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/libs/qmuparser/qmudef.h b/src/libs/qmuparser/qmudef.h index 4e2b4ac81..1217b4420 100644 --- a/src/libs/qmuparser/qmudef.h +++ b/src/libs/qmuparser/qmudef.h @@ -83,18 +83,17 @@ #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) -#define Q_DISABLE_MOVE(Class) \ - Class(Class &&) = delete; \ - Class &operator=(Class &&) = delete; #define Q_DISABLE_COPY_MOVE(Class) \ Q_DISABLE_COPY(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif #ifndef Q_DISABLE_ASSIGN_MOVE #define Q_DISABLE_ASSIGN_MOVE(Class) \ Q_DISABLE_ASSIGN(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif QT_WARNING_PUSH diff --git a/src/libs/vdxf/libdxfrw/drw_base.h b/src/libs/vdxf/libdxfrw/drw_base.h index 56be2dbd9..2c84853de 100644 --- a/src/libs/vdxf/libdxfrw/drw_base.h +++ b/src/libs/vdxf/libdxfrw/drw_base.h @@ -83,18 +83,17 @@ #endif // QT_VERSION < QT_VERSION_CHECK(5, 8, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) -#define Q_DISABLE_MOVE(Class) \ - Class(Class &&) = delete; \ - Class &operator=(Class &&) = delete; #define Q_DISABLE_COPY_MOVE(Class) \ Q_DISABLE_COPY(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif #ifndef Q_DISABLE_ASSIGN_MOVE #define Q_DISABLE_ASSIGN_MOVE(Class) \ Q_DISABLE_ASSIGN(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif typedef signed char dint8; /* 8 bit signed */ diff --git a/src/libs/vmisc/defglobal.h b/src/libs/vmisc/defglobal.h index aa1022b0f..d2c99ae47 100644 --- a/src/libs/vmisc/defglobal.h +++ b/src/libs/vmisc/defglobal.h @@ -47,18 +47,17 @@ void qAsConst(const T &&) Q_DECL_EQ_DELETE; #endif #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) -#define Q_DISABLE_MOVE(Class) \ - Class(Class &&) = delete; \ - Class &operator=(Class &&) = delete; #define Q_DISABLE_COPY_MOVE(Class) \ Q_DISABLE_COPY(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif #ifndef Q_DISABLE_ASSIGN_MOVE #define Q_DISABLE_ASSIGN_MOVE(Class) \ Q_DISABLE_ASSIGN(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif #define SUFFIX_APPEND(x, y) x ## y // NOLINT(cppcoreguidelines-macro-usage) diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer_global.h b/src/libs/vpropertyexplorer/vpropertyexplorer_global.h index 202c35f8d..597b23967 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer_global.h +++ b/src/libs/vpropertyexplorer/vpropertyexplorer_global.h @@ -35,18 +35,17 @@ #endif #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) -#define Q_DISABLE_MOVE(Class) \ - Class(Class &&) = delete; \ - Class &operator=(Class &&) = delete; #define Q_DISABLE_COPY_MOVE(Class) \ Q_DISABLE_COPY(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif #ifndef Q_DISABLE_ASSIGN_MOVE #define Q_DISABLE_ASSIGN_MOVE(Class) \ Q_DISABLE_ASSIGN(Class) \ - Q_DISABLE_MOVE(Class) + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; #endif #endif // VPROPERTYEXPLORER_GLOBAL_H