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/qplatforminputcontext_qpa.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/gui/kernel/qplatforminputcontext_qpa.cpp')

diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp
index f36a4a1af5..ee18f3ebd1 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.cpp
+++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
     QPlatformInputContext provides an interface the actual input methods
     can derive from by reimplementing methods.
 
-    \sa QInputPanel
+    \sa QInputMethod
 */
 
 /*!
@@ -94,7 +94,7 @@ bool QPlatformInputContext::isValid() const
 }
 
 /*!
-    Method to be called when input method needs to be reset. Called by QInputPanel::reset().
+    Method to be called when input method needs to be reset. Called by QInputMethod::reset().
     No further QInputMethodEvents should be sent as response.
  */
 void QPlatformInputContext::reset()
@@ -106,7 +106,7 @@ void QPlatformInputContext::commit()
 }
 
 /*!
-    Notification on editor updates. Called by QInputPanel::update().
+    Notification on editor updates. Called by QInputMethod::update().
  */
 void QPlatformInputContext::update(Qt::InputMethodQueries)
 {
@@ -117,12 +117,12 @@ void QPlatformInputContext::update(Qt::InputMethodQueries)
     the user. Input methods often use this information to offer more word
     suggestions to the user.
  */
-void QPlatformInputContext::invokeAction(QInputPanel::Action action, int cursorPosition)
+void QPlatformInputContext::invokeAction(QInputMethod::Action action, int cursorPosition)
 {
     Q_UNUSED(cursorPosition)
     // Default behavior for simple ephemeral input contexts. Some
     // complex input contexts should not be reset here.
-    if (action == QInputPanel::Click)
+    if (action == QInputMethod::Click)
         reset();
 }
 
@@ -148,17 +148,17 @@ QRectF QPlatformInputContext::keyboardRect() const
 }
 
 /*!
-    Active QPlatformInputContext is responsible for providing keyboardRectangle property to QInputPanel.
+    Active QPlatformInputContext is responsible for providing keyboardRectangle property to QInputMethod.
     In addition of providing the value in keyboardRect function, it also needs to call this emit
     function whenever the property changes.
  */
 void QPlatformInputContext::emitKeyboardRectChanged()
 {
-    emit qApp->inputPanel()->keyboardRectangleChanged();
+    emit qApp->inputMethod()->keyboardRectangleChanged();
 }
 
 /*!
-    This function can be reimplemented to return true whenever input panel is animating
+    This function can be reimplemented to return true whenever input method is animating
     shown or hidden. Default implementation returns false.
  */
 bool QPlatformInputContext::isAnimating() const
@@ -167,13 +167,13 @@ bool QPlatformInputContext::isAnimating() const
 }
 
 /*!
-    Active QPlatformInputContext is responsible for providing animating property to QInputPanel.
+    Active QPlatformInputContext is responsible for providing animating property to QInputMethod.
     In addition of providing the value in isAnimation function, it also needs to call this emit
     function whenever the property changes.
  */
 void QPlatformInputContext::emitAnimatingChanged()
 {
-    emit qApp->inputPanel()->animatingChanged();
+    emit qApp->inputMethod()->animatingChanged();
 }
 
 /*!
@@ -199,13 +199,13 @@ bool QPlatformInputContext::isInputPanelVisible() const
 }
 
 /*!
-    Active QPlatformInputContext is responsible for providing visible property to QInputPanel.
+    Active QPlatformInputContext is responsible for providing visible property to QInputMethod.
     In addition of providing the value in isInputPanelVisible function, it also needs to call this emit
     function whenever the property changes.
  */
 void QPlatformInputContext::emitInputPanelVisibleChanged()
 {
-    emit qApp->inputPanel()->visibleChanged();
+    emit qApp->inputMethod()->visibleChanged();
 }
 
 QLocale QPlatformInputContext::locale() const
@@ -215,7 +215,7 @@ QLocale QPlatformInputContext::locale() const
 
 void QPlatformInputContext::emitLocaleChanged()
 {
-    emit qApp->inputPanel()->localeChanged();
+    emit qApp->inputMethod()->localeChanged();
 }
 
 Qt::LayoutDirection QPlatformInputContext::inputDirection() const
@@ -225,7 +225,7 @@ Qt::LayoutDirection QPlatformInputContext::inputDirection() const
 
 void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDirection)
 {
-    emit qApp->inputPanel()->inputDirectionChanged(newDirection);
+    emit qApp->inputMethod()->inputDirectionChanged(newDirection);
 }
 
 
-- 
cgit v1.2.3