From a256e574f100a5eef046b8ac4b5aa38e6860a4cd Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Mon, 8 Apr 2024 17:07:09 +0200
Subject: Disable copy and move of QAbstractFileEngineHandler

They're not wanted and Axivion (SV71) grumbles about the lack of copy
and move operators and constructors otherwise. Do the same in all
derived classes.  Some of these needed their default constructors made
overt as a result.  Similar for QAbstractFileEngineHandlerList.

Task-number: QTBUG-122619
Change-Id: Iff016940f8c4884bd65dd781354b9bcda9b7cdd8
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
---
 .../corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp    | 3 +++
 tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp           | 6 ++++++
 tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp             | 6 ++++++
 tests/auto/corelib/io/qfile/tst_qfile.cpp                         | 8 ++++++++
 4 files changed, 23 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp
index 5b706961cc..a2747f55a7 100644
--- a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp
+++ b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp
@@ -490,6 +490,7 @@ QHash<QString, QSharedPointer<ReferenceFileEngine::File> > ReferenceFileEngine::
 class FileEngineHandler
     : QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(FileEngineHandler)
     std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override
     {
         if (fileName.endsWith(".tar") || fileName.contains(".tar/"))
@@ -508,6 +509,8 @@ class FileEngineHandler
 
         return nullptr;
     }
+public:
+    FileEngineHandler() = default;
 };
 
 void tst_QAbstractFileEngine::initTestCase()
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
index 0215f863eb..a0a8917c27 100644
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@@ -443,7 +443,10 @@ public:
 
 class EngineWithNoIteratorHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(EngineWithNoIteratorHandler)
 public:
+    EngineWithNoIteratorHandler() = default;
+
     std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override
     {
         return std::make_unique<EngineWithNoIterator>(fileName);
@@ -462,7 +465,10 @@ void tst_QDirIterator::engineWithNoIterator()
 
 class CustomEngineHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(CustomEngineHandler)
 public:
+    CustomEngineHandler() = default;
+
     std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override
     {
         // We want to test QFSFileEngine specifically, so force QDirIterator to use it
diff --git a/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp b/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
index df541ee710..bb4e1b30d2 100644
--- a/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
+++ b/tests/auto/corelib/io/qdirlisting/tst_qdirlisting.cpp
@@ -427,7 +427,10 @@ public:
 
 class EngineWithNoIteratorHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(EngineWithNoIteratorHandler)
 public:
+    EngineWithNoIteratorHandler() = default;
+
     std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override
     {
         return std::make_unique<EngineWithNoIterator>(fileName);
@@ -446,7 +449,10 @@ void tst_QDirListing::engineWithNoIterator()
 
 class CustomEngineHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(CustomEngineHandler)
 public:
+    CustomEngineHandler() = default;
+
     std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override
     {
         // We want to test QFSFileEngine specifically, so force QDirListing to use it
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 00fc1b2aa4..d69cc167d6 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -2334,7 +2334,9 @@ private:
 
 class MyHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(MyHandler)
 public:
+    MyHandler() = default;
     std::unique_ptr<QAbstractFileEngine> create(const QString &) const override
     {
         return std::make_unique<MyEngine>(1);
@@ -2343,7 +2345,10 @@ public:
 
 class MyHandler2 : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(MyHandler2)
 public:
+    MyHandler2() = default;
+
     std::unique_ptr<QAbstractFileEngine> create(const QString &) const override
     {
         return std::make_unique<MyEngine>(2);
@@ -2374,7 +2379,10 @@ void tst_QFile::fileEngineHandler()
 #ifdef QT_BUILD_INTERNAL
 class MyRecursiveHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(MyRecursiveHandler)
 public:
+    MyRecursiveHandler() = default;
+
     std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override
     {
         if (fileName.startsWith(":!")) {
-- 
cgit v1.2.3