Add protected constructor for QVirtualKeyboardAbstractInputMethod

Add QObjectPrivate based constructor to be able to share the
private class. QObjectPrivate enables private slots.

Change-Id: Ibc0bc6c8cb751b03a3e0162d02520eaa669696fb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

5 files changed, 117 insertions, 19 deletions

diff --git a/src/virtualkeyboard/CMakeLists.txt b/src/virtualkeyboard/CMakeLists.txt
index 5dcd7a5f..6080b603 100644
--- a/src/virtualkeyboard/CMakeLists.txt
+++ b/src/virtualkeyboard/CMakeLists.txt
@@ -38,6 +38,7 @@ qt_internal_add_module(VirtualKeyboard
         qvirtualkeyboard_namespace.h
         qvirtualkeyboard_staticplugin_p.h
         qvirtualkeyboardabstractinputmethod.cpp qvirtualkeyboardabstractinputmethod.h
+        qvirtualkeyboardabstractinputmethod_p.cpp qvirtualkeyboardabstractinputmethod_p.h
         qvirtualkeyboarddictionary.cpp qvirtualkeyboarddictionary.h
         qvirtualkeyboarddictionarymanager.cpp qvirtualkeyboarddictionarymanager.h
         qvirtualkeyboardextensionplugin.cpp qvirtualkeyboardextensionplugin.h
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp
index de1c3887..944afb26 100644
--- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.cpp
@@ -28,28 +28,10 @@
 ****************************************************************************/
 
 #include <QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h>
-#include <QtCore/private/qobject_p.h>
+#include <QtVirtualKeyboard/private/qvirtualkeyboardabstractinputmethod_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QVirtualKeyboardAbstractInputMethodPrivate : public QObjectPrivate
-{
-public:
-    QVirtualKeyboardAbstractInputMethodPrivate();
-
-    QVirtualKeyboardInputEngine *inputEngine;
-};
-
-/*!
-    \class AbstractInputMethodPrivate
-    \internal
-*/
-
-QVirtualKeyboardAbstractInputMethodPrivate::QVirtualKeyboardAbstractInputMethodPrivate() :
-    inputEngine(nullptr)
-{
-}
-
 /*!
     \class QVirtualKeyboardAbstractInputMethod
 
@@ -61,9 +43,15 @@ QVirtualKeyboardAbstractInputMethodPrivate::QVirtualKeyboardAbstractInputMethodP
     method using C/C++ language.
 */
 
+QVirtualKeyboardAbstractInputMethod::QVirtualKeyboardAbstractInputMethod(QVirtualKeyboardAbstractInputMethodPrivate &dd, QObject *parent) :
+    QObject(dd, parent)
+{
+}
+
 /*!
     Constructs an input method with \a parent.
 */
+
 QVirtualKeyboardAbstractInputMethod::QVirtualKeyboardAbstractInputMethod(QObject *parent) :
     QObject(*new QVirtualKeyboardAbstractInputMethodPrivate(), parent)
 {
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
index 212a7f01..90ea4d68 100644
--- a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod.h
@@ -42,6 +42,9 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethod : public QObje
     Q_OBJECT
     Q_DECLARE_PRIVATE(QVirtualKeyboardAbstractInputMethod)
 
+protected:
+    QVirtualKeyboardAbstractInputMethod(QVirtualKeyboardAbstractInputMethodPrivate &dd, QObject *parent = nullptr);
+
 public:
     explicit QVirtualKeyboardAbstractInputMethod(QObject *parent = nullptr);
     ~QVirtualKeyboardAbstractInputMethod();
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.cpp b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.cpp
new file mode 100644
index 00000000..c6cb895d
--- /dev/null
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.cpp
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtVirtualKeyboard/private/qvirtualkeyboardabstractinputmethod_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QVirtualKeyboardAbstractInputMethodPrivate
+    \internal
+*/
+
+QVirtualKeyboardAbstractInputMethodPrivate::QVirtualKeyboardAbstractInputMethodPrivate() :
+    QObjectPrivate(),
+    inputEngine(nullptr)
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h
new file mode 100644
index 00000000..f7a310ee
--- /dev/null
+++ b/src/virtualkeyboard/qvirtualkeyboardabstractinputmethod_p.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_P_H
+#define QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
+#include <QtCore/private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QVirtualKeyboardInputEngine;
+
+class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethodPrivate : public QObjectPrivate
+{
+public:
+    QVirtualKeyboardAbstractInputMethodPrivate();
+
+    QVirtualKeyboardInputEngine *inputEngine;
+};
+
+QT_END_NAMESPACE
+
+#endif // QVIRTUALKEYBOARDABSTRACTINPUTMETHOD_P_H