From 7bbde34ee012bbe90c4ce76736c6f71b16e64215 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 23 Feb 2015 17:13:09 +0100 Subject: Fix invocations of static methods of QGuiApplication/QApplication. Change-Id: I99ba58763f6063fa2a6f511adbea0163cce7ea32 Reviewed-by: Konstantin Ritt Reviewed-by: Shawn Rutledge --- src/widgets/graphicsview/qgraphicsitem.cpp | 8 +++--- src/widgets/graphicsview/qgraphicsscene.cpp | 2 +- src/widgets/kernel/qapplication.cpp | 2 +- src/widgets/kernel/qapplication.h | 4 +-- src/widgets/kernel/qgesturemanager.cpp | 2 +- src/widgets/kernel/qwidget.cpp | 42 ++++++++++++++--------------- src/widgets/kernel/qwidget_p.h | 2 +- src/widgets/kernel/qwidgetwindow.cpp | 2 +- src/widgets/widgets/qcombobox.cpp | 2 +- src/widgets/widgets/qlineedit_p.cpp | 4 +-- src/widgets/widgets/qwidgetlinecontrol.cpp | 2 +- src/widgets/widgets/qwidgetlinecontrol_p.h | 4 +-- src/widgets/widgets/qwidgettextcontrol.cpp | 6 ++--- 13 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index b3c7fb3e82..533564c1dc 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -7390,7 +7390,7 @@ void QGraphicsItem::setInputMethodHints(Qt::InputMethodHints hints) QWidget *fw = QApplication::focusWidget(); if (!fw) return; - qApp->inputMethod()->update(Qt::ImHints); + QGuiApplication::inputMethod()->update(Qt::ImHints); } /*! @@ -7408,7 +7408,7 @@ void QGraphicsItem::updateMicroFocus() for (int i = 0 ; i < scene()->views().count() ; ++i) { if (scene()->views().at(i) == fw) { if (qApp) - qApp->inputMethod()->update(Qt::ImQueryAll); + QGuiApplication::inputMethod()->update(Qt::ImQueryAll); break; } } @@ -10141,9 +10141,9 @@ bool QGraphicsTextItem::sceneEvent(QEvent *event) // Reset the focus widget's input context, regardless // of how this item gained or lost focus. if (event->type() == QEvent::FocusIn || event->type() == QEvent::FocusOut) { - qApp->inputMethod()->reset(); + QGuiApplication::inputMethod()->reset(); } else { - qApp->inputMethod()->update(Qt::ImQueryInput); + QGuiApplication::inputMethod()->update(Qt::ImQueryInput); } break; case QEvent::ShortcutOverride: diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 0230b68315..ad58aeb488 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -847,7 +847,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item, // the views, but if we are changing focus, we have to // do it ourselves. if (qApp) - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); } #endif //QT_NO_IM diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index d097313b9b..ad51dc5055 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2151,7 +2151,7 @@ void QApplication::setActiveWindow(QWidget* act) if (QApplicationPrivate::focus_widget) { if (QApplicationPrivate::focus_widget->testAttribute(Qt::WA_InputMethodEnabled)) - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); QFocusEvent focusAboutToChange(QEvent::FocusAboutToChange, Qt::ActiveWindowFocusReason); QApplication::sendEvent(QApplicationPrivate::focus_widget, &focusAboutToChange); diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index d74d058251..d4b2326afd 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -165,9 +165,9 @@ public: #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED static QLocale keyboardInputLocale() - { return qApp ? qApp->inputMethod()->locale() : QLocale::c(); } + { return qApp ? QGuiApplication::inputMethod()->locale() : QLocale::c(); } QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection() - { return qApp ? qApp->inputMethod()->inputDirection() : Qt::LeftToRight; } + { return qApp ? QGuiApplication::inputMethod()->inputDirection() : Qt::LeftToRight; } #endif static int exec(); diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 79acfed883..b5d3a56d3f 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -618,7 +618,7 @@ void QGestureManager::deliverEvents(const QSet &gestures, if (gesture->hasHotSpot()) { // guess the target widget using the hotspot of the gesture QPoint pt = gesture->hotSpot().toPoint(); - if (QWidget *topLevel = qApp->topLevelAt(pt)) { + if (QWidget *topLevel = QApplication::topLevelAt(pt)) { QWidget *child = topLevel->childAt(topLevel->mapFromGlobal(pt)); target = child ? child : topLevel; } diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 6d896f5f50..65b861bc68 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -359,12 +359,12 @@ void QWidgetPrivate::setWSGeometry() void QWidgetPrivate::updateWidgetTransform(QEvent *event) { Q_Q(QWidget); - if (q == qGuiApp->focusObject() || event->type() == QEvent::FocusIn) { + if (q == QGuiApplication::focusObject() || event->type() == QEvent::FocusIn) { QTransform t; QPoint p = q->mapTo(q->topLevelWidget(), QPoint(0,0)); t.translate(p.x(), p.y()); - qApp->inputMethod()->setInputItemTransform(t); - qApp->inputMethod()->setInputItemRectangle(q->rect()); + QGuiApplication::inputMethod()->setInputItemTransform(t); + QGuiApplication::inputMethod()->setInputItemRectangle(q->rect()); } } @@ -3401,10 +3401,10 @@ void QWidgetPrivate::setEnabled_helper(bool enable) if (enable) { if (focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) - qApp->inputMethod()->update(Qt::ImEnabled); + QGuiApplication::inputMethod()->update(Qt::ImEnabled); } else { - qApp->inputMethod()->commit(); - qApp->inputMethod()->update(Qt::ImEnabled); + QGuiApplication::inputMethod()->commit(); + QGuiApplication::inputMethod()->update(Qt::ImEnabled); } } #endif //QT_NO_IM @@ -6427,7 +6427,7 @@ void QWidget::setFocus(Qt::FocusReason reason) if (prev) { if (reason != Qt::PopupFocusReason && reason != Qt::MenuBarFocusReason && prev->testAttribute(Qt::WA_InputMethodEnabled)) { - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); } if (reason != Qt::NoFocusReason) { @@ -6550,7 +6550,7 @@ void QWidget::clearFocus() { if (hasFocus()) { if (testAttribute(Qt::WA_InputMethodEnabled)) - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); QFocusEvent focusAboutToChange(QEvent::FocusAboutToChange); QApplication::sendEvent(this, &focusAboutToChange); @@ -9429,7 +9429,7 @@ void QWidget::focusOutEvent(QFocusEvent *) #ifndef Q_OS_IOS // FIXME: revisit autoSIP logic, QTBUG-42906 if (qApp->autoSipEnabled() && testAttribute(Qt::WA_InputMethodEnabled)) - qApp->inputMethod()->hide(); + QGuiApplication::inputMethod()->hide(); #endif } @@ -9718,8 +9718,8 @@ void QWidget::setInputMethodHints(Qt::InputMethodHints hints) if (d->imHints == hints) return; d->imHints = hints; - if (this == qApp->focusObject()) - qApp->inputMethod()->update(Qt::ImHints); + if (this == QGuiApplication::focusObject()) + QGuiApplication::inputMethod()->update(Qt::ImHints); #endif //QT_NO_IM } @@ -11061,18 +11061,18 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) d->createTLSysExtra(); #ifndef QT_NO_IM QWidget *focusWidget = d->effectiveFocusWidget(); - if (on && !internalWinId() && this == qApp->focusObject() + if (on && !internalWinId() && this == QGuiApplication::focusObject() && focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) { - qApp->inputMethod()->commit(); - qApp->inputMethod()->update(Qt::ImEnabled); + QGuiApplication::inputMethod()->commit(); + QGuiApplication::inputMethod()->update(Qt::ImEnabled); } if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget()) parentWidget()->d_func()->enforceNativeChildren(); if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created)) d->createWinId(); - if (isEnabled() && focusWidget->isEnabled() && this == qApp->focusObject() + if (isEnabled() && focusWidget->isEnabled() && this == QGuiApplication::focusObject() && focusWidget->testAttribute(Qt::WA_InputMethodEnabled)) { - qApp->inputMethod()->update(Qt::ImEnabled); + QGuiApplication::inputMethod()->update(Qt::ImEnabled); } #endif //QT_NO_IM break; @@ -11105,10 +11105,10 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) break; case Qt::WA_InputMethodEnabled: { #ifndef QT_NO_IM - if (qApp->focusObject() == this) { + if (QGuiApplication::focusObject() == this) { if (!on) - qApp->inputMethod()->commit(); - qApp->inputMethod()->update(Qt::ImEnabled); + QGuiApplication::inputMethod()->commit(); + QGuiApplication::inputMethod()->update(Qt::ImEnabled); } #endif //QT_NO_IM break; @@ -11596,8 +11596,8 @@ void QWidget::setShortcutAutoRepeat(int id, bool enable) void QWidget::updateMicroFocus() { // updating everything since this is currently called for any kind of state change - if (this == qApp->focusObject()) - qApp->inputMethod()->update(Qt::ImQueryAll); + if (this == QGuiApplication::focusObject()) + QGuiApplication::inputMethod()->update(Qt::ImQueryAll); } /*! diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 5b99809961..9425426215 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -598,7 +598,7 @@ public: QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel( q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel)); if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) { - qApp->inputMethod()->show(); + QGuiApplication::inputMethod()->show(); } } } diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 6b03ad0b6c..b7ffc20c8e 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -191,7 +191,7 @@ bool QWidgetWindow::event(QEvent *event) case QEvent::FocusAboutToChange: if (QApplicationPrivate::focus_widget) { if (QApplicationPrivate::focus_widget->testAttribute(Qt::WA_InputMethodEnabled)) - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); QGuiApplication::sendSpontaneousEvent(QApplicationPrivate::focus_widget, event); } diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index cc4d2f7701..ab4c7bfff6 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -2646,7 +2646,7 @@ void QComboBox::showPopup() } if (qApp) { - qApp->inputMethod()->reset(); + QGuiApplication::inputMethod()->reset(); } QScrollBar *sb = view()->horizontalScrollBar(); diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index b7d2ab4059..6a41c3791f 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -250,7 +250,7 @@ void QLineEditPrivate::resetInputMethod() { Q_Q(QLineEdit); if (q->hasFocus() && qApp) { - qApp->inputMethod()->reset(); + QGuiApplication::inputMethod()->reset(); } } @@ -270,7 +270,7 @@ bool QLineEditPrivate::sendMouseEventToInputContext( QMouseEvent *e ) if (mousePos >= 0) { if (e->type() == QEvent::MouseButtonRelease) - qApp->inputMethod()->invokeAction(QInputMethod::Click, mousePos); + QGuiApplication::inputMethod()->invokeAction(QInputMethod::Click, mousePos); return true; } diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 4cf7e1812e..f259f7e3a4 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -183,7 +183,7 @@ void QWidgetLineControl::commitPreedit() if (!composeMode()) return; - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); if (!composeMode()) return; diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index f181222655..039453f0d5 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -230,7 +230,7 @@ public: { #ifndef QT_NO_IM if (composeMode()) - qApp->inputMethod()->reset(); + QGuiApplication::inputMethod()->reset(); #endif internalSetText(txt, -1, false); } @@ -328,7 +328,7 @@ public: Qt::LayoutDirection layoutDirection() const { if (m_layoutDirection == Qt::LayoutDirectionAuto) { if (m_text.isEmpty()) - return qApp->inputMethod()->inputDirection(); + return QGuiApplication::inputMethod()->inputDirection(); return m_text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; } return m_layoutDirection; diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 39e0aa5b7a..b0325893a4 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1739,7 +1739,7 @@ void QWidgetTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button _q_updateCurrentCharFormatAndSelection(); #ifndef QT_NO_IM if (contextWidget) - qApp->inputMethod()->update(Qt::ImQueryInput); + QGuiApplication::inputMethod()->update(Qt::ImQueryInput); #endif //QT_NO_IM } else { //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1))); @@ -1887,7 +1887,7 @@ bool QWidgetTextControlPrivate::sendMouseEventToInputContext( if (cursorPos >= 0) { if (eventType == QEvent::MouseButtonRelease) - qApp->inputMethod()->invokeAction(QInputMethod::Click, cursorPos); + QGuiApplication::inputMethod()->invokeAction(QInputMethod::Click, cursorPos); e->setAccepted(true); return true; @@ -2867,7 +2867,7 @@ void QWidgetTextControlPrivate::commitPreedit() if (!isPreediting()) return; - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); if (!isPreediting()) return; -- cgit v1.2.3