Changeset 121323 in webkit

Timestamp:

Jun 27, 2012, 12:09:30 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Avoid use of deprecated Qt API

Reviewed by Tor Arne Vestbø.

QGuiApplication::inputPanel() has been deprecated in favour of
inputMethod().

• UIProcess/qt/QtWebPageEventHandler.cpp:

(WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
(WebKit::QtWebPageEventHandler::~QtWebPageEventHandler):
(WebKit::setInputPanelVisible):
(WebKit::QtWebPageEventHandler::inputPanelVisibleChanged):
(WebKit::QtWebPageEventHandler::updateTextInputState):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtWebPageEventHandler.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-06-26  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Avoid use of deprecated Qt API
+
+        Reviewed by Tor Arne Vestbø.
+
+        QGuiApplication::inputPanel() has been deprecated in favour of
+        inputMethod().
+
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
+        (WebKit::QtWebPageEventHandler::~QtWebPageEventHandler):
+        (WebKit::setInputPanelVisible):
+        (WebKit::QtWebPageEventHandler::inputPanelVisibleChanged):
+        (WebKit::QtWebPageEventHandler::updateTextInputState):
+
 2012-06-26  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp

@@ -32 +32 @@
 #include <QDrag>
 #include <QGuiApplication>
-#include <QInputPanel>
+#include <QInputMethod>
 #include <QMimeData>
 #include <QtQuick/QQuickCanvas>
@@ -101 +101 @@
     , m_isTapHighlightActive(false)
 {
-    connect(qApp->inputPanel(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
+    connect(qApp->inputMethod(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
 }
 
 QtWebPageEventHandler::~QtWebPageEventHandler()
 {
-    disconnect(qApp->inputPanel(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
+    disconnect(qApp->inputMethod(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
 }
 
@@ -391 +391 @@
 static void setInputPanelVisible(bool visible)
 {
-    if (qApp->inputPanel()->visible() == visible)
-        return;
-
-    qApp->inputPanel()->setVisible(visible);
+    if (qApp->inputMethod()->visible() == visible)
+        return;
+
+    qApp->inputMethod()->setVisible(visible);
 }
 
@@ -403 +403 @@
 
     // We only respond to the input panel becoming visible.
-    if (!m_webView->hasActiveFocus() || !qApp->inputPanel()->visible())
+    if (!m_webView->hasActiveFocus() || !qApp->inputMethod()->visible())
         return;
 
@@ -423 +423 @@
         return;
 
-    qApp->inputPanel()->update(Qt::ImQueryInput | Qt::ImEnabled);
+    qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled);
 
     setInputPanelVisible(editor.isContentEditable);