From 71726ccf676ef0921ef557c7162d2d87563066fb Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Tue, 24 Jan 2012 17:44:38 +0200
Subject: Renamed QInputPanel as QInputMethod

QInputMethod better describes what the class is about, input methods
in general, be they panels or just composing input from key events.

Compatability headers added for old name. Not bulletproof but should be
enough to get transition done.

Change-Id: Iefde6e7ccb1ec4a3b226cef3469089e751c60fc1
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
---
 src/gui/kernel/qinputpanel_p.h | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

(limited to 'src/gui/kernel/qinputpanel_p.h')

diff --git a/src/gui/kernel/qinputpanel_p.h b/src/gui/kernel/qinputpanel_p.h
index 88916f80a4..a4f24505c6 100644
--- a/src/gui/kernel/qinputpanel_p.h
+++ b/src/gui/kernel/qinputpanel_p.h
@@ -42,39 +42,16 @@
 #ifndef QINPUTPANEL_P_H
 #define QINPUTPANEL_P_H
 
-#include <qinputpanel.h>
-#include <private/qobject_p.h>
-#include <QtCore/QWeakPointer>
-#include <QTransform>
-#include <qplatforminputcontext_qpa.h>
-#include <private/qguiapplication_p.h>
+#include <private/qinputmethod_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QInputPanelPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QInputPanel)
-
-public:
-    inline QInputPanelPrivate() : testContext(0)
-    {}
-    QPlatformInputContext *platformInputContext() const
-    {
-        return testContext ? testContext : QGuiApplicationPrivate::platformIntegration()->inputContext();
-    }
-    static inline QInputPanelPrivate *get(QInputPanel *inputPanel)
-    {
-        return inputPanel->d_func();
-    }
-    void q_connectFocusObject();
-    void q_checkFocusObject(QObject *object);
-
-    QTransform inputItemTransform;
-    QWeakPointer<QObject> inputItem;
-    QPlatformInputContext *testContext;
-};
+#if 0
+#pragma qt_class(QInputPanelPrivate)
+#endif
+#define QInputPanelPrivate QInputMethodPrivate
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3