Use Q_DISABLE_COPY_MOVE for private classes

Change-Id: I3cfcfba892ff4a0ab4e31f308620b445162bb17b
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

17 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h
index c3044796ad..c9e4b43197 100644
--- a/src/gui/image/qpaintengine_pic_p.h
+++ b/src/gui/image/qpaintengine_pic_p.h
@@ -103,7 +103,7 @@ protected:
     QPicturePaintEngine(QPaintEnginePrivate &dptr);
 
 private:
-    Q_DISABLE_COPY(QPicturePaintEngine)
+    Q_DISABLE_COPY_MOVE(QPicturePaintEngine)
 
     void writeCmdLength(int pos, const QRectF &r, bool corr);
 };
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index b8d13ac092..68d204d76e 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -210,7 +210,7 @@ static QImage copyImageData(const BITMAPINFOHEADER &header, const RGBQUAD *color
 
 class DisplayHdc
 {
-    Q_DISABLE_COPY(DisplayHdc)
+    Q_DISABLE_COPY_MOVE(DisplayHdc)
 public:
     DisplayHdc() : m_displayDc(GetDC(nullptr)) {}
     ~DisplayHdc() { ReleaseDC(nullptr, m_displayDc); }
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index 5f6db07987..8f8eb03f87 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -110,7 +110,7 @@ private:
     QDrag *m_object;
 
     static QDragManager *m_instance;
-    Q_DISABLE_COPY(QDragManager)
+    Q_DISABLE_COPY_MOVE(QDragManager)
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index aeec7b7414..8364557020 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -76,7 +76,7 @@ public:
 private:
     friend QKeyMapperPrivate *qt_keymapper_private();
     Q_DECLARE_PRIVATE(QKeyMapper)
-    Q_DISABLE_COPY(QKeyMapper)
+    Q_DISABLE_COPY_MOVE(QKeyMapper)
 };
 
 struct KeyboardLayoutItem;
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 1cb7390687..2849d0c58e 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -97,7 +97,7 @@ private:
     friend class QOpenGLContextGroupPrivate;
     friend class QOpenGLMultiGroupSharedResource;
 
-    Q_DISABLE_COPY(QOpenGLSharedResource)
+    Q_DISABLE_COPY_MOVE(QOpenGLSharedResource)
 };
 
 class Q_GUI_EXPORT QOpenGLSharedResourceGuard : public QOpenGLSharedResource
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index 9cb4e191cc..563ca8f922 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -508,7 +508,7 @@ public:
             }
         }
     private:
-        Q_DISABLE_COPY(WindowSystemEventList)
+        Q_DISABLE_COPY_MOVE(WindowSystemEventList)
     };
 
     static WindowSystemEventList windowSystemEventQueue;
diff --git a/src/gui/opengl/qopenglcustomshaderstage_p.h b/src/gui/opengl/qopenglcustomshaderstage_p.h
index f4a71af88e..ce3e9efd23 100644
--- a/src/gui/opengl/qopenglcustomshaderstage_p.h
+++ b/src/gui/opengl/qopenglcustomshaderstage_p.h
@@ -80,7 +80,7 @@ protected:
 private:
     QOpenGLCustomShaderStagePrivate* d_ptr;
 
-    Q_DISABLE_COPY(QOpenGLCustomShaderStage)
+    Q_DISABLE_COPY_MOVE(QOpenGLCustomShaderStage)
 };
 
 
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
index 0541ce6168..15ac240b89 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -166,7 +166,7 @@ public:
     bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override;
 
 private:
-    Q_DISABLE_COPY(QOpenGL2PaintEngineEx)
+    Q_DISABLE_COPY_MOVE(QOpenGL2PaintEngineEx)
 
     friend class QOpenGLEngineShaderManager;
 };
diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index 7cac2ac358..28d5f6d6c5 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 template <typename Type> class QDataBuffer
 {
-    Q_DISABLE_COPY(QDataBuffer)
+    Q_DISABLE_COPY_MOVE(QDataBuffer)
 public:
     QDataBuffer(int res)
     {
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index 92d9a4ea66..aab318bcab 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -157,7 +157,7 @@ public:
     QVectorPath path;
 
 private:
-    Q_DISABLE_COPY(QVectorPathConverter)
+    Q_DISABLE_COPY_MOVE(QVectorPathConverter)
 };
 
 class QPainterPathData : public QPainterPathPrivate
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index 64e684e1ad..c25a479807 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -86,7 +86,7 @@ public:
     static QPainterPath intersect(const QPainterPath &path, const QRectF &rect);
 
 private:
-    Q_DISABLE_COPY(QPathClipper)
+    Q_DISABLE_COPY_MOVE(QPathClipper)
 
     enum ClipperMode {
         ClipMode, // do the full clip
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 8580598784..1b649a5d2a 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -196,7 +196,7 @@ public:
 
 
 private:
-    Q_DISABLE_COPY(QVectorPath)
+    Q_DISABLE_COPY_MOVE(QVectorPath)
 
     const QPainterPath::ElementType *m_elements;
     const qreal *m_points;
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h
index f8835dd513..e86ec31e47 100644
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
@@ -165,7 +165,7 @@ public:
     QFontEngine *engines[QChar::ScriptCount];
 
 private:
-    Q_DISABLE_COPY(QFontEngineData)
+    Q_DISABLE_COPY_MOVE(QFontEngineData)
 };
 
 
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
index 02a6a429fa..de01a02fbb 100644
--- a/src/gui/text/qtextdocumentfragment_p.h
+++ b/src/gui/text/qtextdocumentfragment_p.h
@@ -109,7 +109,7 @@ public:
 
     uint importedFromPlainText : 1;
 private:
-    Q_DISABLE_COPY(QTextDocumentFragmentPrivate)
+    Q_DISABLE_COPY_MOVE(QTextDocumentFragmentPrivate)
 };
 
 #ifndef QT_NO_TEXTHTMLPARSER
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h
index 3557c17a97..001a243e84 100644
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@@ -104,7 +104,7 @@ public:
 private:
     QFont defaultFnt;
 
-    Q_DISABLE_COPY(QTextFormatCollection)
+    Q_DISABLE_COPY_MOVE(QTextFormatCollection)
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index eed6ee6a62..378072b366 100644
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -116,7 +116,7 @@ public:
 
 private:
     QZipReaderPrivate *d;
-    Q_DISABLE_COPY(QZipReader)
+    Q_DISABLE_COPY_MOVE(QZipReader)
 };
 Q_DECLARE_TYPEINFO(QZipReader::FileInfo, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(QZipReader::Status, Q_PRIMITIVE_TYPE);
diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h
index 433bbab31e..b3bb5929cf 100644
--- a/src/gui/text/qzipwriter_p.h
+++ b/src/gui/text/qzipwriter_p.h
@@ -108,7 +108,7 @@ public:
     void close();
 private:
     QZipWriterPrivate *d;
-    Q_DISABLE_COPY(QZipWriter)
+    Q_DISABLE_COPY_MOVE(QZipWriter)
 };
 
 QT_END_NAMESPACE