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.h | 83 +++-----------------------------------------
 1 file changed, 5 insertions(+), 78 deletions(-)

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

diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h
index 7b16709e42..95be71d7b5 100644
--- a/src/gui/kernel/qinputpanel.h
+++ b/src/gui/kernel/qinputpanel.h
@@ -42,89 +42,16 @@
 #ifndef QINPUTPANEL_H
 #define QINPUTPANEL_H
 
-#include <QtCore/qobject.h>
+#include <QtGui/qinputmethod.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
-class QInputPanelPrivate;
-class QWindow;
-class QRectF;
-class QTransform;
-
-class Q_GUI_EXPORT QInputPanel : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QInputPanel)
-    Q_PROPERTY(QObject *inputItem READ inputItem WRITE setInputItem NOTIFY inputItemChanged)
-    Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
-    Q_PROPERTY(QRectF keyboardRectangle READ keyboardRectangle NOTIFY keyboardRectangleChanged)
-    Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
-    Q_PROPERTY(bool animating READ isAnimating NOTIFY animatingChanged)
-    Q_PROPERTY(QLocale locale READ locale NOTIFY localeChanged)
-    Q_PROPERTY(Qt::LayoutDirection inputDirection READ inputDirection NOTIFY inputDirectionChanged)
-
-    Q_ENUMS(Action)
-public:
-    QT_DEPRECATED QObject *inputItem() const;
-    QT_DEPRECATED void setInputItem(QObject *inputItemChanged);
-
-    // the window containing the editor
-    QT_DEPRECATED QWindow *inputWindow() const;
-
-    QTransform inputItemTransform() const;
-    void setInputItemTransform(const QTransform &transform);
-
-    // in window coordinates
-    QRectF cursorRectangle() const; // ### what if we have rotations for the item?
-
-    // keyboard geometry in window coords
-    QRectF keyboardRectangle() const;
-
-    enum Action {
-        Click,
-        ContextMenu
-    };
-
-    bool visible() const;
-    void setVisible(bool visible);
-
-    bool isAnimating() const;
-
-    QLocale locale() const;
-    Qt::LayoutDirection inputDirection() const;
-
-public Q_SLOTS:
-    void show();
-    void hide();
-
-    void update(Qt::InputMethodQueries queries);
-    void reset();
-    void commit();
-
-    void invokeAction(Action a, int cursorPosition);
-
-Q_SIGNALS:
-    void inputItemChanged();
-    void cursorRectangleChanged();
-    void keyboardRectangleChanged();
-    void visibleChanged();
-    void animatingChanged();
-    void localeChanged();
-    void inputDirectionChanged(Qt::LayoutDirection newDirection);
-
-private:
-    friend class QGuiApplication;
-    friend class QGuiApplicationPrivate;
-    friend class QPlatformInputContext;
-    QInputPanel();
-    ~QInputPanel();
-
-    Q_PRIVATE_SLOT(d_func(), void q_connectFocusObject());
-    Q_PRIVATE_SLOT(d_func(), void q_checkFocusObject(QObject* object));
-};
+#if 0
+#pragma qt_class(QInputPanel)
+#endif
+#define QInputPanel QInputMethod
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3