diff options
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 16 | ||||
-rw-r--r-- | src/widgets/kernel/qinputcontext.cpp | 12 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 24 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget_p.h | 6 |
4 files changed, 29 insertions, 29 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index cb6a8c1e7c..c23622ac78 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -69,7 +69,7 @@ #include "qmessagebox.h" #include <QtWidgets/qgraphicsproxywidget.h> #include <QtGui/qstylehints.h> -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> #include "qinputcontext.h" #include "private/qkeymapper_p.h" @@ -1976,7 +1976,7 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) // or it is not created fully yet. || (focus_widget && (!focus_widget->testAttribute(Qt::WA_InputMethodEnabled) || !focus_widget->testAttribute(Qt::WA_WState_Created))))) { - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); } #endif //QT_NO_IM @@ -3873,10 +3873,10 @@ bool QApplication::notify(QObject *receiver, QEvent *e) break; } case QEvent::RequestSoftwareInputPanel: - inputPanel()->show(); + inputMethod()->show(); break; case QEvent::CloseSoftwareInputPanel: - inputPanel()->hide(); + inputMethod()->hide(); break; #ifndef QT_NO_GESTURES @@ -4886,22 +4886,22 @@ QInputContext *QApplication::inputContext() const \since 4.2 \obsolete - Returns the current keyboard input locale. Replaced with QInputPanel::locale() + Returns the current keyboard input locale. Replaced with QInputMethod::locale() */ QLocale QApplication::keyboardInputLocale() { - return qApp ? qApp->inputPanel()->locale() : QLocale::c(); + return qApp ? qApp->inputMethod()->locale() : QLocale::c(); } /*! \since 4.2 \obsolete - Returns the current keyboard input direction. Replaced with QInputPanel::inputDirection() + Returns the current keyboard input direction. Replaced with QInputMethod::inputDirection() */ Qt::LayoutDirection QApplication::keyboardInputDirection() { - return qApp ? qApp->inputPanel()->inputDirection() : Qt::LeftToRight; + return qApp ? qApp->inputMethod()->inputDirection() : Qt::LeftToRight; } bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event) diff --git a/src/widgets/kernel/qinputcontext.cpp b/src/widgets/kernel/qinputcontext.cpp index 53e9cce553..fcbee624f5 100644 --- a/src/widgets/kernel/qinputcontext.cpp +++ b/src/widgets/kernel/qinputcontext.cpp @@ -65,7 +65,7 @@ #include "qmenu.h" #include "qtextformat.h" #include "qpalette.h" -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> #include <QtGui/qevent.h> #include <stdlib.h> @@ -228,7 +228,7 @@ void QInputContext::setFocusWidget(QWidget *widget) void QInputContext::sendEvent(const QInputMethodEvent &event) { - QObject *focus = qApp->inputPanel()->inputItem(); + QObject *focus = qApp->inputMethod()->inputItem(); if (!focus) return; @@ -257,7 +257,7 @@ void QInputContext::sendEvent(const QInputMethodEvent &event) void QInputContext::mouseHandler(int x, QMouseEvent *event) { if (event->type() == QEvent::MouseButtonRelease) - qApp->inputPanel()->invokeAction(QInputPanel::Click, x); + qApp->inputMethod()->invokeAction(QInputMethod::Click, x); } @@ -280,7 +280,7 @@ QFont QInputContext::font() const */ void QInputContext::update() { - qApp->inputPanel()->update(Qt::ImQueryAll); + qApp->inputMethod()->update(Qt::ImQueryAll); } /*! @@ -291,7 +291,7 @@ void QInputContext::update() void QInputContext::widgetDestroyed(QWidget *widget) { Q_UNUSED(widget) - // nothing to be done here, as we use a weak pointer in the input panel + // nothing to be done here, as we use a weak pointer in the input method } /*! @@ -316,7 +316,7 @@ void QInputContext::widgetDestroyed(QWidget *widget) */ void QInputContext::reset() { - qApp->inputPanel()->reset(); + qApp->inputMethod()->reset(); } diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 321a374652..2a7497947d 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -78,7 +78,7 @@ #include "qinputcontext.h" #include "qfileinfo.h" #include "private/qsoftkeymanager_p.h" -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> #include <private/qgraphicseffect_p.h> #include <qbackingstore.h> @@ -354,7 +354,7 @@ void QWidgetPrivate::updateWidgetTransform() QTransform t; QPoint p = q->mapTo(q->topLevelWidget(), QPoint(0,0)); t.translate(p.x(), p.y()); - qApp->inputPanel()->setInputItemTransform(t); + qApp->inputMethod()->setInputItemTransform(t); } } @@ -3106,10 +3106,10 @@ void QWidgetPrivate::setEnabled_helper(bool enable) if (enable) { if (focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) - qApp->inputPanel()->update(Qt::ImEnabled); + qApp->inputMethod()->update(Qt::ImEnabled); } else { - qApp->inputPanel()->reset(); - qApp->inputPanel()->update(Qt::ImEnabled); + qApp->inputMethod()->reset(); + qApp->inputMethod()->update(Qt::ImEnabled); } } #endif //QT_NO_IM @@ -8811,7 +8811,7 @@ void QWidget::setInputMethodHints(Qt::InputMethodHints hints) #ifndef QT_NO_IM Q_D(QWidget); d->imHints = hints; - qApp->inputPanel()->update(Qt::ImHints); + qApp->inputMethod()->update(Qt::ImHints); #endif //QT_NO_IM } @@ -10030,8 +10030,8 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) QWidget *focusWidget = d->effectiveFocusWidget(); if (on && !internalWinId() && hasFocus() && focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) { - qApp->inputPanel()->reset(); - qApp->inputPanel()->update(Qt::ImEnabled); + qApp->inputMethod()->reset(); + qApp->inputMethod()->update(Qt::ImEnabled); } if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget() #ifdef Q_WS_MAC @@ -10045,7 +10045,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) d->createWinId(); if (isEnabled() && focusWidget->isEnabled() && focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) { - qApp->inputPanel()->update(Qt::ImEnabled); + qApp->inputMethod()->update(Qt::ImEnabled); } #endif //QT_NO_IM break; @@ -10080,8 +10080,8 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) #ifndef QT_NO_IM if (qApp->focusObject() == this) { if (!on) - qApp->inputPanel()->reset(); - qApp->inputPanel()->update(Qt::ImEnabled); + qApp->inputMethod()->reset(); + qApp->inputMethod()->update(Qt::ImEnabled); } #endif //QT_NO_IM break; @@ -10513,7 +10513,7 @@ void QWidget::setShortcutAutoRepeat(int id, bool enable) void QWidget::updateMicroFocus() { // updating everything since this is currently called for any kind of state change - qApp->inputPanel()->update(Qt::ImQueryAll); + qApp->inputMethod()->update(Qt::ImQueryAll); #ifndef QT_NO_ACCESSIBILITY if (isVisible()) { diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index e600908e27..0da0c65aaa 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -59,7 +59,7 @@ #include "QtCore/qlocale.h" #include "QtCore/qset.h" #include "QtGui/qregion.h" -#include "QtGui/qinputpanel.h" +#include "QtGui/qinputmethod.h" #include "QtWidgets/qsizepolicy.h" #include "QtWidgets/qstyle.h" #include "QtWidgets/qapplication.h" @@ -416,7 +416,7 @@ public: void syncBackingStore(); void syncBackingStore(const QRegion ®ion); - // tells the input panel about the widgets transform + // tells the input method about the widgets transform void updateWidgetTransform(); void reparentFocusWidgets(QWidget *oldtlw); @@ -573,7 +573,7 @@ public: QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel( q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel)); if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) { - qApp->inputPanel()->show(); + qApp->inputMethod()->show(); } } } |