Replace code that has been deprecated in Qt 6

Change-Id: I4af9e2c5a7d94767c11c5ed071c6d8104da07138
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>

7 files changed, 9 insertions, 9 deletions

diff --git a/examples/opcua/opcuaviewer/mainwindow.cpp b/examples/opcua/opcuaviewer/mainwindow.cpp
index 8eec05d..fe15baa 100644
--- a/examples/opcua/opcuaviewer/mainwindow.cpp
+++ b/examples/opcua/opcuaviewer/mainwindow.cpp
@@ -122,7 +122,7 @@ MainWindow::MainWindow(const QString &initialUrl, QWidget *parent) : QMainWindow
     mainWindowGlobal = this;
 
     connect(ui->quitAction, &QAction::triggered, this, &QWidget::close);
-    ui->quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
+    ui->quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q));
 
     connect(ui->aboutAction, &QAction::triggered, this, &QApplication::aboutQt);
     ui->aboutAction->setShortcut(QKeySequence(QKeySequence::HelpContents));
diff --git a/src/imports/opcua/opcua_plugin.h b/src/imports/opcua/opcua_plugin.h
index aed7e79..4806e8c 100644
--- a/src/imports/opcua/opcua_plugin.h
+++ b/src/imports/opcua/opcua_plugin.h
@@ -46,7 +46,7 @@ class OpcUaPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/opcua/opcuaendpointdiscovery.h b/src/imports/opcua/opcuaendpointdiscovery.h
index f813ce0..9dcf336 100644
--- a/src/imports/opcua/opcuaendpointdiscovery.h
+++ b/src/imports/opcua/opcuaendpointdiscovery.h
@@ -84,8 +84,8 @@ private slots:
 
 private:
     // Callbacks from QQmlParserStatus
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     QString m_serverUrl;
     OpcUaConnection *m_connection = nullptr;
diff --git a/src/opcua/client/qopcuapkiconfiguration.cpp b/src/opcua/client/qopcuapkiconfiguration.cpp
index a912b4f..df17e18 100644
--- a/src/opcua/client/qopcuapkiconfiguration.cpp
+++ b/src/opcua/client/qopcuapkiconfiguration.cpp
@@ -235,7 +235,7 @@ QOpcUaApplicationIdentity QOpcUaPkiConfiguration::applicationIdentity() const
             // const QString dns = value[QLatin1String("DNS")].toString();
             const QString uri = value[QLatin1String("URI")].toString();
 
-            const auto token = uri.split(':', Qt::SkipEmptyParts);
+            const auto token = uri.split(QChar::fromLatin1(':'), Qt::SkipEmptyParts);
 
             if (token.size() != 4) {
                 qCWarning(QT_OPCUA_SECURITY) << "URI string from certificate has unexpected format:"
diff --git a/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp b/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp
index 66c4845..825269c 100644
--- a/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp
+++ b/src/opcua/x509/qopcuax509certificatesigningrequest_openssl.cpp
@@ -115,7 +115,7 @@ static X509_EXTENSION *createExtension(QOpcUaX509Extension *extension)
                 return nullptr;
             }
 
-            if (pair.second.isEmpty() || pair.second.contains(',')) {
+            if (pair.second.isEmpty() || pair.second.contains(QChar::fromLatin1(','))) {
                 qCWarning(lcSsl()) << "Invalid SubjectAlternativeName value";
                 return nullptr;
             }
diff --git a/src/plugins/opcua/open62541/qopen62541subscription.cpp b/src/plugins/opcua/open62541/qopen62541subscription.cpp
index 0fc5d51..c1966c0 100644
--- a/src/plugins/opcua/open62541/qopen62541subscription.cpp
+++ b/src/plugins/opcua/open62541/qopen62541subscription.cpp
@@ -205,7 +205,7 @@ void QOpen62541Subscription::modifyMonitoring(quint64 handle, QOpcUa::NodeAttrib
 
     // SetMonitoringMode service
     if (item == QOpcUaMonitoringParameters::Parameter::MonitoringMode) {
-        if (value.type() != QVariant::UserType || value.userType() != QMetaType::type("QOpcUaMonitoringParameters::MonitoringMode")) {
+        if (value.type() != QVariant::UserType || value.userType() != QMetaType::fromType<QOpcUaMonitoringParameters::MonitoringMode>().id()) {
             qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "New value for MonitoringMode is not a monitoring mode";
             p.setStatusCode(QOpcUa::UaStatusCode::BadTypeMismatch);
             emit m_backend->monitoringStatusChanged(handle, attr, item, p);
diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
index 13aa932..a4fcf23 100644
--- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
+++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
@@ -525,7 +525,7 @@ QVariant arrayToQVariant(const UA_Variant &var, QMetaType::Type type)
         for (size_t i = 0; i < var.arrayLength; ++i) {
             QVariant tempVar = QVariant::fromValue(scalarToQt<TARGETTYPE, UATYPE>(&temp[i]));
             if (type != QMetaType::UnknownType && type != static_cast<QMetaType::Type>(tempVar.type()))
-                tempVar.convert(type);
+                tempVar.convert(QMetaType(type));
             list.append(tempVar);
         }
 
@@ -545,7 +545,7 @@ QVariant arrayToQVariant(const UA_Variant &var, QMetaType::Type type)
     } else if (UA_Variant_isScalar(&var)) {
         QVariant tempVar = QVariant::fromValue(scalarToQt<TARGETTYPE, UATYPE>(temp));
         if (type != QMetaType::UnknownType && type != static_cast<QMetaType::Type>(tempVar.type()))
-            tempVar.convert(type);
+            tempVar.convert(QMetaType(type));
         return tempVar;
     } else if (var.arrayLength == 0 && var.data == UA_EMPTY_ARRAY_SENTINEL) {
         return QVariantList(); // Return empty QVariantList for empty array