From 28d3a4eb261318046464ea18d329aeecb9f1d9d0 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 27 Feb 2019 11:20:19 +0100
Subject: Cleanup QML client certificate selection implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Get rid of copy constructors for QObjects by making the elements objects
on the heap.

Change-Id: Ic9a214f01b39feb824b99d17d17fd342d431cd97
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 .../api/qquickwebengineclientcertificateselection.cpp | 19 +++----------------
 .../api/qquickwebengineclientcertificateselection_p.h |  6 +-----
 src/webengine/plugin/plugin.cpp                       |  4 ++--
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/webengine/api/qquickwebengineclientcertificateselection.cpp b/src/webengine/api/qquickwebengineclientcertificateselection.cpp
index 56cf1ff64..c48a59887 100644
--- a/src/webengine/api/qquickwebengineclientcertificateselection.cpp
+++ b/src/webengine/api/qquickwebengineclientcertificateselection.cpp
@@ -55,23 +55,10 @@ QT_BEGIN_NAMESPACE
     \sa {WebEngineClientCertificateSelection::certificates} {WebEngineClientCertificateSelection.certificates}
 */
 
-QQuickWebEngineClientCertificateOption::QQuickWebEngineClientCertificateOption() = default;
-
 QQuickWebEngineClientCertificateOption::QQuickWebEngineClientCertificateOption(QQuickWebEngineClientCertificateSelection *selection, int index)
-        : QObject(), m_selection(selection), m_index(index)
-{}
-
-QQuickWebEngineClientCertificateOption::QQuickWebEngineClientCertificateOption(const QQuickWebEngineClientCertificateOption &other)
-        : QObject(), m_selection(other.m_selection), m_index(other.m_index)
+        : QObject(selection), m_selection(selection), m_index(index)
 {}
 
-QQuickWebEngineClientCertificateOption &QQuickWebEngineClientCertificateOption::operator=(const QQuickWebEngineClientCertificateOption &other)
-{
-    m_selection = other.m_selection;
-    m_index = other.m_index;
-    return *this;
-}
-
 /*!
     \qmlproperty string WebEngineClientCertificateOption::issuer
     \brief The issuer of the certificate.
@@ -164,7 +151,7 @@ QQuickWebEngineClientCertificateOption *QQuickWebEngineClientCertificateSelectio
     QQuickWebEngineClientCertificateSelection *d = static_cast<QQuickWebEngineClientCertificateSelection *>(p->object);
     if (idx < 0 || idx >= d->m_certificates.size())
         return nullptr;
-    return &d->m_certificates[idx];
+    return d->m_certificates[idx];
 }
 
 /*!
@@ -177,7 +164,7 @@ QQmlListProperty<QQuickWebEngineClientCertificateOption> QQuickWebEngineClientCe
     if (m_certificates.empty()) {
         QVector<QSslCertificate> certificates = d_ptr->certificates();
         for (int i = 0; i < certificates.count(); ++i)
-            m_certificates.push_back(QQuickWebEngineClientCertificateOption(this, i));
+            m_certificates.push_back(new QQuickWebEngineClientCertificateOption(this, i));
     }
 
     return QQmlListProperty<QQuickWebEngineClientCertificateOption>(
diff --git a/src/webengine/api/qquickwebengineclientcertificateselection_p.h b/src/webengine/api/qquickwebengineclientcertificateselection_p.h
index 7f5a26296..adf8b5f7c 100644
--- a/src/webengine/api/qquickwebengineclientcertificateselection_p.h
+++ b/src/webengine/api/qquickwebengineclientcertificateselection_p.h
@@ -76,10 +76,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineClientCertificateOption : public
     Q_PROPERTY(bool isSelfSigned READ isSelfSigned CONSTANT FINAL)
 
 public:
-    QQuickWebEngineClientCertificateOption();
-    QQuickWebEngineClientCertificateOption(const QQuickWebEngineClientCertificateOption &);
-    QQuickWebEngineClientCertificateOption &operator=(const QQuickWebEngineClientCertificateOption &);
-
     QString issuer() const;
     QString subject() const;
     QDateTime effectiveDate() const;
@@ -120,7 +116,7 @@ private:
 
     explicit QQuickWebEngineClientCertificateSelection(QSharedPointer<ClientCertSelectController>);
 
-    mutable QVector<QQuickWebEngineClientCertificateOption> m_certificates;
+    mutable QVector<QQuickWebEngineClientCertificateOption *> m_certificates;
     QSharedPointer<ClientCertSelectController> d_ptr;
 };
 
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index 82a76760d..381837e08 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -159,9 +159,9 @@ public:
                                                                              msgUncreatableType("RegisterProtocolHandlerRequest"));
         qmlRegisterUncreatableType<QQuickWebEngineAction>(uri, 1, 8, "WebEngineAction", msgUncreatableType("WebEngineAction"));
         qmlRegisterUncreatableType<QQuickWebEngineClientCertificateSelection>(uri, 1, 9, "WebEngineClientCertificateSelection",
-            tr("Cannot create a separate instance of WebEngineClientCertificateSelection"));
+                                                                              msgUncreatableType("WebEngineClientCertificateSelection"));
         qmlRegisterUncreatableType<QQuickWebEngineClientCertificateOption>(uri, 1, 9, "WebEngineClientCertificateOption",
-            tr("Cannot create a separate instance of WebEngineClientCertificateOption"));
+                                                                           msgUncreatableType("WebEngineClientCertificateOption"));
         qmlRegisterUncreatableType<QWebEngineNotification>(uri, 1, 9, "WebEngineNotification", msgUncreatableType("WebEngineNotification"));
     }
 
-- 
cgit v1.2.3