Apply Q_DISABLE_COPY_MOVE macro in some widgets

src/core/CutterCommon.h

@@ -15,11 +15,11 @@
 #endif // Q_OS_WIN
 
 // Rizin list iteration macros
-#define CutterRzListForeach(list, it, type, x)                                                      \
+#define CutterRzListForeach(list, it, type, x)                                                     \
     if (list)                                                                                      \
         for (it = list->head; it && ((x = static_cast<type *>(it->data))); it = it->n)
 
-#define CutterRzVectorForeach(vec, it, type)                                                        \
+#define CutterRzVectorForeach(vec, it, type)                                                       \
     if ((vec) && (vec)->a)                                                                         \
         for (it = (type *)(vec)->a;                                                                \
              (char *)it != (char *)(vec)->a + ((vec)->len * (vec)->elem_size);                     \
@@ -74,4 +74,19 @@ inline QString RzHexString(RVA size)
 #    define CUTTER_DEPRECATED(msg)
 #endif
 
+/**
+ * @brief Since Qt versions < 5.13 don't define the Q_DISABLE_COPY_MOVE
+ * macro, we define it here. This check and this macro definition  will
+ * be deprecated when Cutter moves to a greater than 5.13.0 Qt version.
+ */
+#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)
+#endif
+
 #endif // CUTTERCORE_H

src/widgets/AddressableDockWidget.h

@@ -11,6 +11,8 @@ class CutterSeekable;
 class AddressableDockWidget : public CutterDockWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(AddressableDockWidget)
+
 public:
     AddressableDockWidget(MainWindow *parent);
     ~AddressableDockWidget() override {}

src/widgets/BacktraceWidget.h

@@ -17,6 +17,7 @@ class BacktraceWidget;
 class BacktraceWidget : public CutterDockWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(BacktraceWidget)
 
 public:
     explicit BacktraceWidget(MainWindow *main);

src/widgets/BoolToggleDelegate.h

@@ -7,6 +7,9 @@
 
 class CUTTER_EXPORT BoolTogggleDelegate : public QStyledItemDelegate
 {
+    Q_OBJECT
+    Q_DISABLE_COPY_MOVE(BoolTogggleDelegate)
+
 public:
     BoolTogggleDelegate(QObject *parent = nullptr);
 

src/widgets/BreakpointWidget.h

@@ -23,6 +23,7 @@ class BreakpointWidget;
 class BreakpointModel : public AddressableItemModel<QAbstractListModel>
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(BreakpointModel)
 
     friend BreakpointWidget;
 
@@ -60,6 +61,7 @@ class BreakpointModel : public AddressableItemModel<QAbstractListModel>
 class BreakpointProxyModel : public AddressableFilterProxyModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(BreakpointProxyModel)
 
 public:
     BreakpointProxyModel(BreakpointModel *sourceModel, QObject *parent = nullptr);
@@ -68,6 +70,7 @@ class BreakpointProxyModel : public AddressableFilterProxyModel
 class BreakpointWidget : public CutterDockWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(BreakpointWidget)
 
 public:
     explicit BreakpointWidget(MainWindow *main);

src/widgets/CallGraph.h

@@ -13,6 +13,8 @@ class MainWindow;
 class CallGraphView : public SimpleTextGraphView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CallGraphView)
+
 public:
     CallGraphView(CutterDockWidget *parent, MainWindow *main, bool global);
     void showExportDialog() override;

src/widgets/ClassesWidget.h

@@ -23,6 +23,9 @@ class ClassesWidget;
  */
 class ClassesModel : public QAbstractItemModel
 {
+    Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ClassesModel)
+
 public:
     enum Columns { NAME = 0, TYPE, OFFSET, VTABLE, COUNT };
 
@@ -72,6 +75,7 @@ Q_DECLARE_METATYPE(ClassesModel::RowType)
 class BinClassesModel : public ClassesModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(BinClassesModel)
 
 private:
     QList<BinClassDescription> classes;
@@ -93,6 +97,7 @@ class BinClassesModel : public ClassesModel
 class AnalysisClassesModel : public ClassesModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(AnalysisClassesModel)
 
 private:
     /**

src/widgets/ColorPicker.h

@@ -11,6 +11,7 @@ namespace ColorPickerHelpers {
 class ColorPickWidgetAbstract : public QWidget
 {
     Q_OBJECT
+
 public:
     ColorPickWidgetAbstract(QWidget *parent = nullptr) : QWidget(parent) {}
     virtual ~ColorPickWidgetAbstract() {}
@@ -37,6 +38,7 @@ class ColorPicker;
 class ColorPicker : public ColorPickerHelpers::ColorPickWidgetAbstract
 {
     Q_OBJECT
+
 public:
     explicit ColorPicker(QWidget *parent = nullptr);
     ~ColorPicker();
@@ -95,6 +97,7 @@ namespace ColorPickerHelpers {
 class ColorPickerWidget : public ColorPickWidgetAbstract
 {
     Q_OBJECT
+
 public:
     ColorPickerWidget(QWidget *parent = nullptr);
 
@@ -119,6 +122,7 @@ class ColorPickerWidget : public ColorPickWidgetAbstract
 class ColorShowWidget : public ColorPickWidgetAbstract
 {
     Q_OBJECT
+
 public:
     explicit ColorShowWidget(QWidget *parent = nullptr);
 
@@ -135,6 +139,7 @@ class ColorShowWidget : public ColorPickWidgetAbstract
 class ColorPickArea : public ColorPickerWidget
 {
     Q_OBJECT
+
 public:
     explicit ColorPickArea(QWidget *parent = nullptr);
 
@@ -152,6 +157,7 @@ class ColorPickArea : public ColorPickerWidget
 class AlphaChannelBar : public ColorPickerWidget
 {
     Q_OBJECT
+
 public:
     AlphaChannelBar(QWidget *parent = nullptr) : ColorPickerWidget(parent) {}
 
@@ -173,6 +179,7 @@ class AlphaChannelBar : public ColorPickerWidget
 class ColorValueBar : public ColorPickerWidget
 {
     Q_OBJECT
+
 public:
     ColorValueBar(QWidget *parent = nullptr) : ColorPickerWidget(parent) {}
 

src/widgets/ColorThemeComboBox.h

@@ -9,6 +9,7 @@
 class ColorThemeComboBox : public QComboBox
 {
     Q_OBJECT
+
 public:
     explicit ColorThemeComboBox(QWidget *parent = nullptr);
 

src/widgets/ColorThemeListView.h

@@ -20,6 +20,8 @@ class ColorSettingsModel;
 class ColorThemeListView : public QListView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ColorThemeListView)
+
 public:
     ColorThemeListView(QWidget *parent = nullptr);
     virtual ~ColorThemeListView() override {}
@@ -56,6 +58,8 @@ private slots:
 class ColorSettingsModel : public QAbstractListModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ColorSettingsModel)
+
 public:
     ColorSettingsModel(QObject *parent = nullptr);
     virtual ~ColorSettingsModel() override {}
@@ -81,6 +85,8 @@ class ColorSettingsModel : public QAbstractListModel
 class ColorOptionDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ColorOptionDelegate)
+
 public:
     ColorOptionDelegate(QObject *parent = nullptr);
     ~ColorOptionDelegate() override {}

src/widgets/ComboQuickFilterView.h

@@ -13,6 +13,7 @@ class ComboQuickFilterView;
 class CUTTER_EXPORT ComboQuickFilterView : public QWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ComboQuickFilterView)
 
 public:
     explicit ComboQuickFilterView(QWidget *parent = nullptr);

src/widgets/CommentsWidget.h

@@ -25,6 +25,7 @@ struct CommentGroup
 class CommentsModel : public AddressableItemModel<>
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CommentsModel)
 
     friend CommentsWidget;
 
@@ -61,6 +62,7 @@ class CommentsModel : public AddressableItemModel<>
 class CommentsProxyModel : public AddressableFilterProxyModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CommentsProxyModel)
 
 public:
     CommentsProxyModel(CommentsModel *sourceModel, QObject *parent = nullptr);
@@ -73,6 +75,7 @@ class CommentsProxyModel : public AddressableFilterProxyModel
 class CommentsWidget : public ListDockWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CommentsWidget)
 
 public:
     explicit CommentsWidget(MainWindow *main);

src/widgets/ConsoleWidget.h

@@ -22,6 +22,7 @@ class ConsoleWidget;
 class ConsoleWidget : public CutterDockWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(ConsoleWidget)
 
 public:
     explicit ConsoleWidget(MainWindow *main);

src/widgets/CutterDockWidget.h

@@ -11,6 +11,7 @@ class MainWindow;
 class CUTTER_EXPORT CutterDockWidget : public QDockWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CutterDockWidget)
 
 public:
     CUTTER_DEPRECATED("Action will be ignored. Use CutterDockWidget(MainWindow*) instead.")

src/widgets/CutterGraphView.h

@@ -17,6 +17,8 @@
 class CutterGraphView : public GraphView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CutterGraphView)
+
 public:
     CutterGraphView(QWidget *parent);
     virtual bool event(QEvent *event) override;

src/widgets/CutterTreeView.h

@@ -14,6 +14,7 @@ class CutterTreeView;
 class CUTTER_EXPORT CutterTreeView : public QTreeView
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CutterTreeView)
 
 public:
     explicit CutterTreeView(QWidget *parent = nullptr);

src/widgets/CutterTreeWidget.h

@@ -10,8 +10,8 @@ class MainWindow;
 
 class CUTTER_EXPORT CutterTreeWidget : public QObject
 {
-
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(CutterTreeWidget)
 
 public:
     explicit CutterTreeWidget(QObject *parent = nullptr);

src/widgets/SdbWidget.h

@@ -15,21 +15,6 @@ class SdbWidget;
 class SdbWidget : public CutterDockWidget
 {
     Q_OBJECT
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
-#    define Q_DISABLE_COPY(SdbWidget)                                                              \
-        SdbWidget(const SdbWidget &s) = delete;                                                    \
-        SdbWidget &operator=(const SdbWidget &s) = delete;
-
-#    define Q_DISABLE_MOVE(SdbWidget)                                                              \
-        SdbWidget(SdbWidget &&s) = delete;                                                         \
-        SdbWidget &operator=(SdbWidget &&s) = delete;
-
-#    define Q_DISABLE_COPY_MOVE(SdbWidget)                                                         \
-        Q_DISABLE_COPY(SdbWidget)                                                                  \
-        Q_DISABLE_MOVE(SdbWidget)
-#endif
-
     Q_DISABLE_COPY_MOVE(SdbWidget)
 
 public: