AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove internal uses of Software input panel events.

Browse Source 
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Pekka Vuorela 2011-09-08 13:45:43 +03:00 committed by Lars Knoll
parent b002e21d15
commit 78bb937e15
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/kernel/qapplication.cpp
View File

@ -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<QWidget> that = prev;

4
src/widgets/kernel/qwidget_p.h
View File

@ -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();
}
}
}

4
src/widgets/statemachine/qguistatemachine.cpp
View File

@ -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);