Remove duplicate pimpl pointers

Start using QObjectPrivate in private classes. Requires dependency to
core-private.

Task-number: QTRD-2819
Change-Id: I758783080de579f793457b50a1e32aeb5ab1a3eb
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

18 files changed, 39 insertions, 43 deletions

diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp
index edf91894..8820d756 100644
--- a/src/virtualkeyboard/abstractinputmethod.cpp
+++ b/src/virtualkeyboard/abstractinputmethod.cpp
@@ -30,12 +30,11 @@
 */
 
 /*!
-    Constructs an input method with \a d_ptr as the private data
+    Constructs an input method with \a dd as the private data
     from the derived class and \a parent as the parent.
 */
-AbstractInputMethod::AbstractInputMethod(AbstractInputMethodPrivate *d_ptr, QObject *parent) :
-    QObject(parent),
-    d_ptr(d_ptr)
+AbstractInputMethod::AbstractInputMethod(AbstractInputMethodPrivate &dd, QObject *parent) :
+    QObject(dd, parent)
 {
 }
 
@@ -43,8 +42,7 @@ AbstractInputMethod::AbstractInputMethod(AbstractInputMethodPrivate *d_ptr, QObj
     Constructs an input method with \a parent.
 */
 AbstractInputMethod::AbstractInputMethod(QObject *parent) :
-    QObject(parent),
-    d_ptr(new AbstractInputMethodPrivate())
+    QObject(*new AbstractInputMethodPrivate(), parent)
 {
 }
 
diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/abstractinputmethod.h
index 8ea91559..c698fdde 100644
--- a/src/virtualkeyboard/abstractinputmethod.h
+++ b/src/virtualkeyboard/abstractinputmethod.h
@@ -21,11 +21,11 @@
 
 #include "declarativeinputengine.h"
 #include "declarativeselectionlistmodel.h"
+#include <QtCore/private/qobject_p.h>
 
-class AbstractInputMethodPrivate
+class AbstractInputMethodPrivate : public QObjectPrivate
 {
 public:
-    virtual ~AbstractInputMethodPrivate() {}
     DeclarativeInputEngine *inputEngine;
 };
 
@@ -36,7 +36,7 @@ class AbstractInputMethod : public QObject
     Q_PROPERTY(QString className READ className CONSTANT)
 
 protected:
-    AbstractInputMethod(AbstractInputMethodPrivate *d_ptr, QObject *parent = 0);
+    AbstractInputMethod(AbstractInputMethodPrivate &dd, QObject *parent = 0);
 public:
     explicit AbstractInputMethod(QObject *parent = 0);
     ~AbstractInputMethod();
@@ -68,9 +68,6 @@ private:
     void setInputEngine(DeclarativeInputEngine *inputEngine);
 
     friend class DeclarativeInputEngine;
-
-protected:
-    QScopedPointer<AbstractInputMethodPrivate> d_ptr;
 };
 
 #endif
diff --git a/src/virtualkeyboard/abstractinputpanel.cpp b/src/virtualkeyboard/abstractinputpanel.cpp
index cccfa165..6deda242 100644
--- a/src/virtualkeyboard/abstractinputpanel.cpp
+++ b/src/virtualkeyboard/abstractinputpanel.cpp
@@ -37,6 +37,16 @@
 */
 
 /*!
+    Creates an input panel container with \a dd as private data and
+    \a parent but does not construct the view. The view is explicitly
+    constructed by the AbstractInputPanel::createView() method.
+*/
+AbstractInputPanel::AbstractInputPanel(QObjectPrivate &dd, QObject *parent) :
+    QObject(dd, parent)
+{
+}
+
+/*!
     Creates an input panel container with \a parent but does not construct
     the view. The view is explicitly constructed by the
     AbstractInputPanel::createView() method.
diff --git a/src/virtualkeyboard/abstractinputpanel.h b/src/virtualkeyboard/abstractinputpanel.h
index 7b85def2..a2a33a1f 100644
--- a/src/virtualkeyboard/abstractinputpanel.h
+++ b/src/virtualkeyboard/abstractinputpanel.h
@@ -24,6 +24,8 @@
 class AbstractInputPanel : public QObject
 {
     Q_OBJECT
+protected:
+    AbstractInputPanel(QObjectPrivate &dd, QObject *parent = 0);
 public:
     explicit AbstractInputPanel(QObject *parent = 0);
     ~AbstractInputPanel();
diff --git a/src/virtualkeyboard/appinputpanel.cpp b/src/virtualkeyboard/appinputpanel.cpp
index cf929452..7d1c1d44 100644
--- a/src/virtualkeyboard/appinputpanel.cpp
+++ b/src/virtualkeyboard/appinputpanel.cpp
@@ -17,16 +17,16 @@
 ****************************************************************************/
 
 #include "appinputpanel.h"
+#include <QtCore/private/qobject_p.h>
 
-class AppInputPanelPrivate
+class AppInputPanelPrivate : public QObjectPrivate
 {
 public:
     bool visible;
 };
 
 AppInputPanel::AppInputPanel(QObject *parent) :
-    AbstractInputPanel(parent),
-    d_ptr(new AppInputPanelPrivate())
+    AbstractInputPanel(*new AppInputPanelPrivate(), parent)
 {
 }
 
diff --git a/src/virtualkeyboard/appinputpanel.h b/src/virtualkeyboard/appinputpanel.h
index 346cc670..47f6e1b6 100644
--- a/src/virtualkeyboard/appinputpanel.h
+++ b/src/virtualkeyboard/appinputpanel.h
@@ -34,9 +34,6 @@ public:
     void show();
     void hide();
     bool isVisible() const;
-
-private:
-    QScopedPointer<AppInputPanelPrivate> d_ptr;
 };
 
 #endif // APPINPUTPANEL_H
diff --git a/src/virtualkeyboard/declarativeinputcontext.cpp b/src/virtualkeyboard/declarativeinputcontext.cpp
index 6974cf24..f01f29b4 100644
--- a/src/virtualkeyboard/declarativeinputcontext.cpp
+++ b/src/virtualkeyboard/declarativeinputcontext.cpp
@@ -25,6 +25,7 @@
 #include <QEvent>
 #include <QTextFormat>
 #include <QGuiApplication>
+#include <QtCore/private/qobject_p.h>
 
 /*!
     \qmlmodule QtQuick.Enterprise.VirtualKeyboard 1.0
@@ -40,7 +41,7 @@
     \brief Contains classes for integrating input methods.
 */
 
-class DeclarativeInputContextPrivate
+class DeclarativeInputContextPrivate : public QObjectPrivate
 {
 public:
     PlatformInputContext *inputContext;
@@ -83,8 +84,7 @@ public:
     context.
 */
 DeclarativeInputContext::DeclarativeInputContext(PlatformInputContext *parent) :
-    QObject(parent),
-    d_ptr(new DeclarativeInputContextPrivate())
+    QObject(*new DeclarativeInputContextPrivate(), parent)
 {
     Q_D(DeclarativeInputContext);
     d->inputContext = parent;
diff --git a/src/virtualkeyboard/declarativeinputcontext.h b/src/virtualkeyboard/declarativeinputcontext.h
index 3ba54370..8071839b 100644
--- a/src/virtualkeyboard/declarativeinputcontext.h
+++ b/src/virtualkeyboard/declarativeinputcontext.h
@@ -106,7 +106,6 @@ private:
 
 private:
     friend class PlatformInputContext;
-    QScopedPointer<DeclarativeInputContextPrivate> d_ptr;
 };
 
 #endif
diff --git a/src/virtualkeyboard/declarativeinputengine.cpp b/src/virtualkeyboard/declarativeinputengine.cpp
index 4ea2a792..2451cd70 100644
--- a/src/virtualkeyboard/declarativeinputengine.cpp
+++ b/src/virtualkeyboard/declarativeinputengine.cpp
@@ -22,8 +22,9 @@
 #include "virtualkeyboarddebug.h"
 
 #include <QTimerEvent>
+#include <QtCore/private/qobject_p.h>
 
-class DeclarativeInputEnginePrivate
+class DeclarativeInputEnginePrivate : public QObjectPrivate
 {
 public:
     virtual ~DeclarativeInputEnginePrivate() { }
@@ -95,8 +96,7 @@ private:
     Constructs an input engine with input context as \a parent.
 */
 DeclarativeInputEngine::DeclarativeInputEngine(DeclarativeInputContext *parent) :
-    QObject(parent),
-    d_ptr(new DeclarativeInputEnginePrivate())
+    QObject(*new DeclarativeInputEnginePrivate(), parent)
 {
     Q_D(DeclarativeInputEngine);
     d->inputContext = parent;
diff --git a/src/virtualkeyboard/declarativeinputengine.h b/src/virtualkeyboard/declarativeinputengine.h
index 280fe9f5..ce0b36a8 100644
--- a/src/virtualkeyboard/declarativeinputengine.h
+++ b/src/virtualkeyboard/declarativeinputengine.h
@@ -101,7 +101,6 @@ protected:
 
 private:
     friend class DeclarativeInputContext;
-    const QScopedPointer<DeclarativeInputEnginePrivate> d_ptr;
 };
 
 Q_DECLARE_METATYPE(DeclarativeInputEngine::TextCase)
diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.cpp b/src/virtualkeyboard/declarativeselectionlistmodel.cpp
index 5622796c..d6386062 100644
--- a/src/virtualkeyboard/declarativeselectionlistmodel.cpp
+++ b/src/virtualkeyboard/declarativeselectionlistmodel.cpp
@@ -18,8 +18,9 @@
 
 #include "declarativeselectionlistmodel.h"
 #include "abstractinputmethod.h"
+#include <QtCore/private/qabstractitemmodel_p.h>
 
-class DeclarativeSelectionListModelPrivate
+class DeclarativeSelectionListModelPrivate : public QAbstractItemModelPrivate
 {
 public:
     QHash<int, QByteArray> roles;
@@ -92,8 +93,7 @@ public:
 */
 
 DeclarativeSelectionListModel::DeclarativeSelectionListModel(QObject *parent) :
-    QAbstractListModel(parent),
-    d_ptr(new DeclarativeSelectionListModelPrivate())
+    QAbstractListModel(*new DeclarativeSelectionListModelPrivate(), parent)
 {
     Q_D(DeclarativeSelectionListModel);
     d->roles[DisplayRole] = "display";
diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.h b/src/virtualkeyboard/declarativeselectionlistmodel.h
index df0dbcf0..76fabe32 100644
--- a/src/virtualkeyboard/declarativeselectionlistmodel.h
+++ b/src/virtualkeyboard/declarativeselectionlistmodel.h
@@ -63,7 +63,6 @@ protected slots:
 
 private:
     friend class DeclarativeInputEngine;
-    QScopedPointer<DeclarativeSelectionListModelPrivate> d_ptr;
 };
 
 Q_DECLARE_METATYPE(DeclarativeSelectionListModel::Type)
diff --git a/src/virtualkeyboard/declarativeshifthandler.cpp b/src/virtualkeyboard/declarativeshifthandler.cpp
index fbb43b32..4e979260 100644
--- a/src/virtualkeyboard/declarativeshifthandler.cpp
+++ b/src/virtualkeyboard/declarativeshifthandler.cpp
@@ -18,8 +18,9 @@
 
 #include "declarativeshifthandler.h"
 #include "declarativeinputcontext.h"
+#include <QtCore/private/qobject_p.h>
 
-class DeclarativeShiftHandlerPrivate
+class DeclarativeShiftHandlerPrivate : public QObjectPrivate
 {
 public:
     DeclarativeInputContext *inputContext;
@@ -41,8 +42,7 @@ public:
 */
 
 DeclarativeShiftHandler::DeclarativeShiftHandler(DeclarativeInputContext *parent) :
-    QObject(parent),
-    d_ptr(new DeclarativeShiftHandlerPrivate())
+    QObject(*new DeclarativeShiftHandlerPrivate(), parent)
 {
     Q_D(DeclarativeShiftHandler);
     d->inputContext = parent;
diff --git a/src/virtualkeyboard/declarativeshifthandler.h b/src/virtualkeyboard/declarativeshifthandler.h
index f1b7a99c..fb5cb519 100644
--- a/src/virtualkeyboard/declarativeshifthandler.h
+++ b/src/virtualkeyboard/declarativeshifthandler.h
@@ -20,7 +20,6 @@
 #define AUTOSHIFTHANDLER_H
 
 #include <QObject>
-#include <QScopedPointer>
 
 class DeclarativeInputContext;
 class DeclarativeShiftHandlerPrivate;
@@ -53,7 +52,6 @@ private:
 
 private:
     friend class DeclarativeInputContext;
-    QScopedPointer<DeclarativeShiftHandlerPrivate> d_ptr;
 };
 
 #endif // AUTOSHIFTHANDLER_H
diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp
index bbafba81..7f04b833 100644
--- a/src/virtualkeyboard/hunspellinputmethod.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod.cpp
@@ -146,7 +146,7 @@ public:
 };
 
 HunspellInputMethod::HunspellInputMethod(QObject *parent) :
-    AbstractInputMethod(new HunspellInputMethodPrivate(this), parent)
+    AbstractInputMethod(*new HunspellInputMethodPrivate(this), parent)
 {
 }
 
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index 59a17747..0782d6c9 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -17,7 +17,7 @@ include(doc/doc.pri)
 target.path = $$TARGETPATH
 INSTALLS += target
 
-QT += quick gui gui-private
+QT += quick gui gui-private core-private
 
 CONFIG += plugin
 CONFIG += link_pkgconfig
diff --git a/src/virtualkeyboard/xcbinputpanel.cpp b/src/virtualkeyboard/xcbinputpanel.cpp
index 240f74bc..17c30b9c 100644
--- a/src/virtualkeyboard/xcbinputpanel.cpp
+++ b/src/virtualkeyboard/xcbinputpanel.cpp
@@ -27,16 +27,16 @@
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
 #include <qpa/qplatformnativeinterface.h>
+#include <QtCore/private/qobject_p.h>
 
-class XcbInputPanelPrivate
+class XcbInputPanelPrivate : public QObjectPrivate
 {
 public:
     QScopedPointer<InputView> view;
 };
 
 XcbInputPanel::XcbInputPanel(QObject *parent) :
-    AbstractInputPanel(parent),
-    d_ptr(new XcbInputPanelPrivate())
+    AbstractInputPanel(*new XcbInputPanelPrivate(), parent)
 {
     /*  Activate the alpha buffer for this application.
     */
diff --git a/src/virtualkeyboard/xcbinputpanel.h b/src/virtualkeyboard/xcbinputpanel.h
index b9a091f2..cf6e7ee6 100644
--- a/src/virtualkeyboard/xcbinputpanel.h
+++ b/src/virtualkeyboard/xcbinputpanel.h
@@ -46,9 +46,6 @@ protected slots:
     void repositionView(const QRect &rect);
     void focusWindowChanged(QWindow *focusWindow);
     void focusWindowVisibleChanged(bool visible);
-
-private:
-    QScopedPointer<XcbInputPanelPrivate> d_ptr;
 };
 
 #endif // INPUTPANEL_H