From bb9ba4349af79519a72f36148d68fd65761162f2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Sun, 23 Apr 2023 10:02:04 +0200
Subject: [PATCH] Utils: Use Q_DISABLE_COPY / Q_DISABLE_COPY_MOVE

Change-Id: If9ea6220700769cd99ede3ebaacc4d75cb673e89
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/libs/utils/delegates.h     | 8 ++------
 src/libs/utils/layoutbuilder.h | 4 ++--
 src/libs/utils/terminalhooks.h | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/libs/utils/delegates.h b/src/libs/utils/delegates.h
index 97f1c774c38..ff012152f5f 100644
--- a/src/libs/utils/delegates.h
+++ b/src/libs/utils/delegates.h
@@ -62,18 +62,14 @@ private:
 
 class QTCREATOR_UTILS_EXPORT CompleterDelegate : public QStyledItemDelegate
 {
+    Q_DISABLE_COPY_MOVE(CompleterDelegate)
+
 public:
     CompleterDelegate(const QStringList &candidates, QObject *parent = nullptr);
     CompleterDelegate(QAbstractItemModel *model, QObject *parent = nullptr);
     CompleterDelegate(QCompleter *completer, QObject *parent = nullptr);
     ~CompleterDelegate() override;
 
-    CompleterDelegate(const CompleterDelegate &other) = delete;
-    CompleterDelegate(CompleterDelegate &&other) = delete;
-
-    CompleterDelegate &operator=(const CompleterDelegate &other) = delete;
-    CompleterDelegate &operator=(CompleterDelegate &&other) = delete;
-
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                           const QModelIndex &index) const override;
     void setEditorData(QWidget *editor, const QModelIndex &index) const override;
diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h
index 2f534cb488d..d34a8f6cf44 100644
--- a/src/libs/utils/layoutbuilder.h
+++ b/src/libs/utils/layoutbuilder.h
@@ -162,6 +162,8 @@ QTCREATOR_UTILS_EXPORT QWidget *createHr(QWidget *parent = nullptr);
 
 class QTCREATOR_UTILS_EXPORT LayoutBuilder
 {
+    Q_DISABLE_COPY(LayoutBuilder)
+
 public:
     enum LayoutType {
         HBoxLayout,
@@ -175,9 +177,7 @@ public:
 
     explicit LayoutBuilder(LayoutType layoutType, const LayoutItems &items = {});
 
-    LayoutBuilder(const LayoutBuilder &) = delete;
     LayoutBuilder(LayoutBuilder &&) = default;
-    LayoutBuilder &operator=(const LayoutBuilder &) = delete;
     LayoutBuilder &operator=(LayoutBuilder &&) = default;
 
     ~LayoutBuilder();
diff --git a/src/libs/utils/terminalhooks.h b/src/libs/utils/terminalhooks.h
index 5a614400f4f..b37c51517c0 100644
--- a/src/libs/utils/terminalhooks.h
+++ b/src/libs/utils/terminalhooks.h
@@ -17,15 +17,13 @@ class ProcessInterface;
 template<typename R, typename... Params>
 class Hook
 {
+    Q_DISABLE_COPY_MOVE(Hook)
+
 public:
     using Callback = std::function<R(Params...)>;
 
 public:
     Hook() = delete;
-    Hook(const Hook &other) = delete;
-    Hook(Hook &&other) = delete;
-    Hook &operator=(const Hook &other) = delete;
-    Hook &operator=(Hook &&other) = delete;
 
     explicit Hook(Callback defaultCallback) { set(defaultCallback); }