Address API review comments for Qt Wayland

1. Adds explicit to new constructor
2. Adds an empty destructor for consistency to new class
3. Moved new data member into private class.

Change-Id: Ib76c1cbea214693c929ced8651bdac92c2dbcd4e
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
(cherry picked from commit 8ed95b29cf2090ffd8ba161dc16a0f661429caea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 13 insertions, 7 deletions

diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index 466dd715..af7c051f 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -75,6 +75,8 @@ public:
         QWaylandClient *parent = nullptr;
     };
     Listener listener;
+
+    QWaylandClient::TextInputProtocols mTextInputProtocols = QWaylandClient::NoProtocol;
 };
 
 /*!
@@ -103,7 +105,6 @@ public:
  */
 QWaylandClient::QWaylandClient(QWaylandCompositor *compositor, wl_client *client)
     : QObject(*new QWaylandClientPrivate(compositor, client))
-    , mTextInputProtocols(TextInputProtocol::NoProtocol)
 {
     Q_D(QWaylandClient);
 
@@ -276,13 +277,15 @@ void QWaylandClient::close()
 
 QWaylandClient::TextInputProtocols QWaylandClient::textInputProtocols() const
 {
-    return mTextInputProtocols;
+    Q_D(const QWaylandClient);
+    return d->mTextInputProtocols;
 }
 
 void QWaylandClient::setTextInputProtocols(TextInputProtocols p)
 {
-    if (mTextInputProtocols != p)
-        mTextInputProtocols = p;
+    Q_D(QWaylandClient);
+    if (d->mTextInputProtocols != p)
+        d->mTextInputProtocols = p;
 }
 
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h
index b2e27f69..244041f0 100644
--- a/src/compositor/compositor_api/qwaylandclient.h
+++ b/src/compositor/compositor_api/qwaylandclient.h
@@ -93,8 +93,6 @@ public Q_SLOTS:
 
 private:
     explicit QWaylandClient(QWaylandCompositor *compositor, wl_client *client);
-
-    TextInputProtocols mTextInputProtocols;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandtextinputmanagerv4.cpp b/src/compositor/extensions/qwaylandtextinputmanagerv4.cpp
index 09d70c0c..e7ec4b66 100644
--- a/src/compositor/extensions/qwaylandtextinputmanagerv4.cpp
+++ b/src/compositor/extensions/qwaylandtextinputmanagerv4.cpp
@@ -115,6 +115,10 @@ QWaylandTextInputManagerV4::QWaylandTextInputManagerV4(QWaylandCompositor *compo
 {
 }
 
+QWaylandTextInputManagerV4::~QWaylandTextInputManagerV4()
+{
+}
+
 void QWaylandTextInputManagerV4::initialize()
 {
     qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO;
diff --git a/src/compositor/extensions/qwaylandtextinputmanagerv4.h b/src/compositor/extensions/qwaylandtextinputmanagerv4.h
index f004648c..5339ea39 100644
--- a/src/compositor/extensions/qwaylandtextinputmanagerv4.h
+++ b/src/compositor/extensions/qwaylandtextinputmanagerv4.h
@@ -54,7 +54,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManagerV4 : public QWaylandCo
     Q_DECLARE_PRIVATE(QWaylandTextInputManagerV4)
 public:
     QWaylandTextInputManagerV4();
-    QWaylandTextInputManagerV4(QWaylandCompositor *compositor);
+    explicit QWaylandTextInputManagerV4(QWaylandCompositor *compositor);
+    ~QWaylandTextInputManagerV4() override;
 
     void initialize() override;