ColorPickWidgetAbstract is an abstract class therefore Q_DISABLE_COPY…

…_MOVE doesn't compile
rizinorg · Oct 21, 2021 · 8ef172e · 8ef172e
1 parent c0a06a6
commit 8ef172e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/core/CutterCommon.h b/src/core/CutterCommon.h
@@ -81,8 +81,8 @@ inline QString RzHexString(RVA size)
  */
 #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #    define Q_DISABLE_MOVE(Class)                                                                  \
-        Class(Class &&w) = delete;                                                                 \
-        Class &operator=(Class &&w) = delete;
+        Class(Class &&) = delete;                                                                  \
+        Class &operator=(Class &&) = delete;
 
 #    define Q_DISABLE_COPY_MOVE(Class)                                                             \
         Q_DISABLE_COPY(Class)                                                                      \

diff --git a/src/widgets/ColorPicker.h b/src/widgets/ColorPicker.h
@@ -11,7 +11,6 @@ namespace ColorPickerHelpers {
 class ColorPickWidgetAbstract : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorPickWidgetAbstract)
 
 public:
     ColorPickWidgetAbstract(QWidget *parent = nullptr) : QWidget(parent) {}
@@ -39,7 +38,6 @@ class ColorPicker;
 class ColorPicker : public ColorPickerHelpers::ColorPickWidgetAbstract
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorPicker)
 
 public:
     explicit ColorPicker(QWidget *parent = nullptr);
@@ -99,7 +97,6 @@ namespace ColorPickerHelpers {
 class ColorPickerWidget : public ColorPickWidgetAbstract
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorPickerWidget)
 
 public:
     ColorPickerWidget(QWidget *parent = nullptr);
@@ -125,7 +122,6 @@ class ColorPickerWidget : public ColorPickWidgetAbstract
 class ColorShowWidget : public ColorPickWidgetAbstract
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorShowWidget)
 
 public:
     explicit ColorShowWidget(QWidget *parent = nullptr);
@@ -143,7 +139,6 @@ class ColorShowWidget : public ColorPickWidgetAbstract
 class ColorPickArea : public ColorPickerWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorPickArea)
 
 public:
     explicit ColorPickArea(QWidget *parent = nullptr);
@@ -162,7 +157,6 @@ class ColorPickArea : public ColorPickerWidget
 class AlphaChannelBar : public ColorPickerWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(AlphaChannelBar)
 
 public:
     AlphaChannelBar(QWidget *parent = nullptr) : ColorPickerWidget(parent) {}
@@ -185,7 +179,6 @@ class AlphaChannelBar : public ColorPickerWidget
 class ColorValueBar : public ColorPickerWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorValueBar)
 
 public:
     ColorValueBar(QWidget *parent = nullptr) : ColorPickerWidget(parent) {}

diff --git a/src/widgets/ColorThemeComboBox.h b/src/widgets/ColorThemeComboBox.h
@@ -9,7 +9,6 @@
 class ColorThemeComboBox : public QComboBox
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ColorThemeComboBox)
 
 public:
     explicit ColorThemeComboBox(QWidget *parent = nullptr);