From 78bb937e154f90afc24d4266705d9331a181fdee Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Thu, 8 Sep 2011 13:45:43 +0300 Subject: Remove internal uses of Software input panel events. Replaced with QInputPanel method calls. Only remaining instance in QApplication::notify(). Change-Id: I384661f81d08b4322ce538bb21dbce9c7aef2f87 Reviewed-on: http://codereview.qt-project.org/4454 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/widgets/kernel/qapplication.cpp | 10 ---------- src/widgets/kernel/qwidget_p.h | 4 ++-- src/widgets/statemachine/qguistatemachine.cpp | 4 ---- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 25c0e7f8cc..ff3fd89712 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2097,16 +2097,6 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) ) prev->setEditFocus(false); } -#endif -#ifndef QT_NO_IM - if (focus) { - QInputContext *prevIc; - prevIc = prev->inputContext(); - if (prevIc && prevIc != focus->inputContext()) { - QEvent closeSIPEvent(QEvent::CloseSoftwareInputPanel); - QApplication::sendEvent(prev, &closeSIPEvent); - } - } #endif QFocusEvent out(QEvent::FocusOut, reason); QPointer that = prev; diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 7c74f794f9..6e1568e0fa 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -59,6 +59,7 @@ #include "QtCore/qlocale.h" #include "QtCore/qset.h" #include "QtGui/qregion.h" +#include "QtGui/qinputpanel.h" #include "QtWidgets/qsizepolicy.h" #include "QtWidgets/qstyle.h" #include "QtWidgets/qapplication.h" @@ -663,8 +664,7 @@ public: QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel( q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel)); if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) { - QEvent event(QEvent::RequestSoftwareInputPanel); - QApplication::sendEvent(q, &event); + qApp->inputPanel()->show(); } } } diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp index 665f7acfd9..7a498eb77f 100644 --- a/src/widgets/statemachine/qguistatemachine.cpp +++ b/src/widgets/statemachine/qguistatemachine.cpp @@ -456,10 +456,6 @@ static QEvent *cloneEvent(QEvent *e) break; #endif - case QEvent::RequestSoftwareInputPanel: - case QEvent::CloseSoftwareInputPanel: - return new QEvent(*e); - case QEvent::UpdateSoftKeys: return new QEvent(*e); -- cgit v1.2.3