From 4f3300b7ce5c3138421a21ec83615a536c9fd316 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Mon, 13 Feb 2012 17:13:22 +0200
Subject: Adapt to QInputPanel -> QInputMethod renaming

Change-Id: Id11fc9ae1be91611fee22d28407e54035e190c71
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
---
 .../qdeclarativetextinput/tst_qdeclarativetextinput.cpp      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/auto/declarative/qdeclarativetextinput')

diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index aae4a954..06d1604d 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -49,7 +49,7 @@
 #include <QDir>
 #include <QStyle>
 #include <private/qapplication_p.h>
-#include <private/qinputpanel_p.h>
+#include <private/qinputmethod_p.h>
 #include <private/qwidgetlinecontrol_p.h>
 #include "../shared/platforminputcontext.h"
 
@@ -84,7 +84,7 @@ void sendPreeditText(const QString &text, int cursor)
     attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, cursor,
                                                    text.length(), QVariant()));
     QInputMethodEvent event(text, attributes);
-    QApplication::sendEvent(qApp->inputPanel()->inputItem(), &event);
+    QApplication::sendEvent(qApp->inputMethod()->inputItem(), &event);
 }
 
 
@@ -2632,7 +2632,7 @@ void tst_qdeclarativetextinput::inputContextMouseHandler()
     QApplication::processEvents();
 
     QEXPECT_FAIL("", "QTBUG-24035", Abort);
-    QCOMPARE(platformInputContext.m_action, QInputPanel::Click);
+    QCOMPARE(platformInputContext.m_action, QInputMethod::Click);
     QCOMPARE(platformInputContext.m_invokeActionCallCount, 1);
     QCOMPARE(platformInputContext.m_cursorPosition, 2);
 }
@@ -2661,7 +2661,7 @@ void tst_qdeclarativetextinput::inputMethodComposing()
 
     {
         QInputMethodEvent inputEvent(text.mid(3), QList<QInputMethodEvent::Attribute>());
-        QApplication::sendEvent(qApp->inputPanel()->inputItem(), &inputEvent);
+        QApplication::sendEvent(qApp->inputMethod()->inputItem(), &inputEvent);
     }
 
     QCOMPARE(input.isInputMethodComposing(), true);
@@ -2669,7 +2669,7 @@ void tst_qdeclarativetextinput::inputMethodComposing()
 
     {
         QInputMethodEvent inputEvent(text.mid(12), QList<QInputMethodEvent::Attribute>());
-        QApplication::sendEvent(qApp->inputPanel()->inputItem(), &inputEvent);
+        QApplication::sendEvent(qApp->inputMethod()->inputItem(), &inputEvent);
     }
 
     QCOMPARE(input.isInputMethodComposing(), true);
@@ -2677,7 +2677,7 @@ void tst_qdeclarativetextinput::inputMethodComposing()
 
     {
         QInputMethodEvent inputEvent;
-        QApplication::sendEvent(qApp->inputPanel()->inputItem(), &inputEvent);
+        QApplication::sendEvent(qApp->inputMethod()->inputItem(), &inputEvent);
     }
     QCOMPARE(input.isInputMethodComposing(), false);
     QCOMPARE(spy.count(), 2);
-- 
cgit v1.2.3