Axivion: Fix more issues

Pick-to: 6.7
Change-Id: I2d89a6d62b50debc2bf4da9773c605b736766201
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

7 files changed, 19 insertions, 0 deletions

diff --git a/src/interfaceframework/qifconfiguration_p.h b/src/interfaceframework/qifconfiguration_p.h
index bce8c1b5..5f1bdf5f 100644
--- a/src/interfaceframework/qifconfiguration_p.h
+++ b/src/interfaceframework/qifconfiguration_p.h
@@ -76,6 +76,7 @@ public:
     QHash<QString, QIfSettingsObject*> m_settingsHash;
     QHash<QString, QIfConfiguration*> m_configurationHash;
 private:
+    Q_DISABLE_COPY_MOVE(QIfConfigurationManager)
     QIfConfigurationManager();
 };
 
diff --git a/src/interfaceframework/qifpendingreply.cpp b/src/interfaceframework/qifpendingreply.cpp
index dd375f8b..3b2b8151 100644
--- a/src/interfaceframework/qifpendingreply.cpp
+++ b/src/interfaceframework/qifpendingreply.cpp
@@ -559,6 +559,11 @@ QIfPendingReplyBase::QIfPendingReplyBase(const QIfPendingReplyBase &other)
     this->m_watcher = other.m_watcher;
 }
 
+QIfPendingReplyBase::QIfPendingReplyBase(const QIfPendingReplyBase && other)
+{
+    this->m_watcher = std::move(other.m_watcher);
+}
+
 /*!
     \qmlproperty QIfPendingReplyWatcher* PendingReply::watcher
     \brief Holds the watcher for the PendingReply
diff --git a/src/interfaceframework/qifpendingreply.h b/src/interfaceframework/qifpendingreply.h
index 19f25a10..4627d8f9 100644
--- a/src/interfaceframework/qifpendingreply.h
+++ b/src/interfaceframework/qifpendingreply.h
@@ -64,6 +64,7 @@ public:
     explicit QIfPendingReplyBase(int userType);
     QIfPendingReplyBase() = default;
     QIfPendingReplyBase(const QIfPendingReplyBase & other);
+    QIfPendingReplyBase(const QIfPendingReplyBase && other);
     ~QIfPendingReplyBase() = default;
     QIfPendingReplyBase& operator=(const QIfPendingReplyBase&) = default;
     QIfPendingReplyBase& operator=(QIfPendingReplyBase&&) = default;
@@ -87,6 +88,7 @@ protected:
 template <typename T> class QIfPendingReply : public QIfPendingReplyBase
 {
 public:
+    // AXIVION Next Line Qt-FunctionArgsByValueRef: treat T as a complex type
     QIfPendingReply(const T &successValue)
         : QIfPendingReply()
     {
@@ -99,6 +101,7 @@ public:
 
     using QIfPendingReplyBase::setSuccess;
 
+    // AXIVION Next Line Qt-FunctionArgsByValueRef: treat T as a complex type
     void setSuccess(const T &val)
     {
         setSuccessNoCheck(QVariant::fromValue(val));
diff --git a/src/interfaceframework/qifservicemanager_p.h b/src/interfaceframework/qifservicemanager_p.h
index aa8dd25a..8557d9e4 100644
--- a/src/interfaceframework/qifservicemanager_p.h
+++ b/src/interfaceframework/qifservicemanager_p.h
@@ -37,6 +37,9 @@ class QIfProxyServiceObject;
 Q_DECLARE_LOGGING_CATEGORY(qLcIfServiceManagement)
 
 struct Backend {
+    Q_DISABLE_COPY_MOVE(Backend)
+
+    Backend() = default;
     ~Backend();
 
     QString name;
diff --git a/src/interfaceframework/qifsimulationproxy.h b/src/interfaceframework/qifsimulationproxy.h
index a947df44..4d332ccd 100644
--- a/src/interfaceframework/qifsimulationproxy.h
+++ b/src/interfaceframework/qifsimulationproxy.h
@@ -91,6 +91,7 @@ namespace qtif_private {
     template <typename T> class QIfSimulationProxy: public QIfSimulationProxyBase
     {
     public:
+        Q_DISABLE_COPY_MOVE(QIfSimulationProxy)
         QIfSimulationProxy(QObject *p=nullptr)
             : QIfSimulationProxyBase(&staticMetaObject, m_instance, methodMap(), p)
         {
@@ -164,6 +165,8 @@ namespace qtif_private {
     template <class T> class RecursionGuard
     {
     public:
+        Q_DISABLE_COPY_MOVE(RecursionGuard)
+
         RecursionGuard() {
             m_savedValue = qtif_private::QIfSimulationProxy<T>::recursionGuard;
         }
diff --git a/src/interfaceframework/queryparser/qifqueryparser.g b/src/interfaceframework/queryparser/qifqueryparser.g
index 369093bd..dcc527cd 100644
--- a/src/interfaceframework/queryparser/qifqueryparser.g
+++ b/src/interfaceframework/queryparser/qifqueryparser.g
@@ -83,6 +83,8 @@ public:
     };
 
 public:
+    Q_DISABLE_COPY_MOVE(QIfQueryParser)
+
     QIfQueryParser();
     virtual ~QIfQueryParser();
 
diff --git a/src/interfaceframework/queryparser/qifqueryparser_p.h b/src/interfaceframework/queryparser/qifqueryparser_p.h
index b8cf2f85..6600dbfc 100644
--- a/src/interfaceframework/queryparser/qifqueryparser_p.h
+++ b/src/interfaceframework/queryparser/qifqueryparser_p.h
@@ -34,6 +34,8 @@ public:
     };
 
 public:
+    Q_DISABLE_COPY_MOVE(QIfQueryParser)
+
     QIfQueryParser();
     virtual ~QIfQueryParser();