Rename remaining references to QInputPanel

Change-Id: I747d37d10c78af6ad00322d5bd8d29c6b343828c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 2fff583..3a386c1 100644 (file)
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -89,7 +89,7 @@
     pair; it does not use the system locale database.
 
     \note For the current keyboard input locale take a look at
-    QInputPanel::locale().
+    QInputMethod::locale().
 
     QLocale's data is based on Common Locale Data Repository v1.8.1.
 
@@ -114,7 +114,7 @@
     California, Berkeley and its contributors.
 
     \sa QString::arg(), QString::toInt(), QString::toDouble(),
-    QInputPanel::locale()
+    QInputMethod::locale()
 */
 
 /*!

diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index 77c3811..c7d823d 100644 (file)
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -64,7 +64,7 @@ public:
     virtual void reset();
     virtual void commit();
     virtual void update(Qt::InputMethodQueries);
-    virtual void invokeAction(QInputPanel::Action, int cursorPosition);
+    virtual void invokeAction(QInputMethod::Action, int cursorPosition);
     virtual bool filterEvent(const QEvent *event);
     virtual QRectF keyboardRect() const;
     void emitKeyboardRectChanged();

diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index c506466..ca8f492 100644 (file)
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -57,7 +57,7 @@ public:
 
     bool isValid() const;
 
-    void invokeAction(QInputPanel::Action a, int x);
+    void invokeAction(QInputMethod::Action a, int x);
     void reset();
     void commit();
     void update(Qt::InputMethodQueries);

diff --git a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
index 3760885..a17abe7 100644 (file)
--- a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h
@@ -59,7 +59,7 @@ public:
 
     bool isValid() const;
 
-    void invokeAction(QInputPanel::Action action, int x);
+    void invokeAction(QInputMethod::Action action, int x);
     void reset(void);
     void update(Qt::InputMethodQueries);
     virtual QRectF keyboardRect() const;

diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h
index a33d24e..610bad0 100644 (file)
--- a/src/plugins/platforms/windows/qwindowsinputcontext.h
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.h
@@ -70,7 +70,7 @@ public:
 
     virtual void reset();
     virtual void update(Qt::InputMethodQueries);
-    virtual void invokeAction(QInputPanel::Action, int cursorPosition);
+    virtual void invokeAction(QInputMethod::Action, int cursorPosition);
 
     static QWindowsInputContext *instance();