diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-23 17:13:09 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-25 14:06:27 +0000 |
| commit | 7bbde34ee012bbe90c4ce76736c6f71b16e64215 (patch) | |
| tree | 964071b52f26b84ec1139db544d959adaafdf0a1 /src/gui/kernel | |
| parent | e4e8a8ac77e3d09246412f1bf68324cfe90d00e2 (diff) | |
Fix invocations of static methods of QGuiApplication/QApplication.
Change-Id: I99ba58763f6063fa2a6f511adbea0163cce7ea32
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qplatforminputcontext.cpp | 10 | ||||
| -rw-r--r-- | src/gui/kernel/qsimpledrag.cpp | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/kernel/qplatforminputcontext.cpp b/src/gui/kernel/qplatforminputcontext.cpp index e983ded20b..f9ff1d36d9 100644 --- a/src/gui/kernel/qplatforminputcontext.cpp +++ b/src/gui/kernel/qplatforminputcontext.cpp @@ -163,7 +163,7 @@ QRectF QPlatformInputContext::keyboardRect() const */ void QPlatformInputContext::emitKeyboardRectChanged() { - emit qApp->inputMethod()->keyboardRectangleChanged(); + emit QGuiApplication::inputMethod()->keyboardRectangleChanged(); } /*! @@ -182,7 +182,7 @@ bool QPlatformInputContext::isAnimating() const */ void QPlatformInputContext::emitAnimatingChanged() { - emit qApp->inputMethod()->animatingChanged(); + emit QGuiApplication::inputMethod()->animatingChanged(); } /*! @@ -214,7 +214,7 @@ bool QPlatformInputContext::isInputPanelVisible() const */ void QPlatformInputContext::emitInputPanelVisibleChanged() { - emit qApp->inputMethod()->visibleChanged(); + emit QGuiApplication::inputMethod()->visibleChanged(); } QLocale QPlatformInputContext::locale() const @@ -224,7 +224,7 @@ QLocale QPlatformInputContext::locale() const void QPlatformInputContext::emitLocaleChanged() { - emit qApp->inputMethod()->localeChanged(); + emit QGuiApplication::inputMethod()->localeChanged(); } Qt::LayoutDirection QPlatformInputContext::inputDirection() const @@ -234,7 +234,7 @@ Qt::LayoutDirection QPlatformInputContext::inputDirection() const void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDirection) { - emit qApp->inputMethod()->inputDirectionChanged(newDirection); + emit QGuiApplication::inputMethod()->inputDirectionChanged(newDirection); } /*! diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp index b3dc6e915d..090e88c118 100644 --- a/src/gui/kernel/qsimpledrag.cpp +++ b/src/gui/kernel/qsimpledrag.cpp @@ -255,18 +255,18 @@ void QBasicDrag::updateCursor(Qt::DropAction action) } } - QCursor *cursor = qApp->overrideCursor(); + QCursor *cursor = QGuiApplication::overrideCursor(); QPixmap pixmap = m_drag->dragCursor(action); if (!cursor) { - qApp->changeOverrideCursor((pixmap.isNull()) ? QCursor(cursorShape) : QCursor(pixmap)); + QGuiApplication::changeOverrideCursor((pixmap.isNull()) ? QCursor(cursorShape) : QCursor(pixmap)); } else { if (!pixmap.isNull()) { if ((cursor->pixmap().cacheKey() != pixmap.cacheKey())) { - qApp->changeOverrideCursor(QCursor(pixmap)); + QGuiApplication::changeOverrideCursor(QCursor(pixmap)); } } else { if (cursorShape != cursor->shape()) { - qApp->changeOverrideCursor(QCursor(cursorShape)); + QGuiApplication::changeOverrideCursor(QCursor(cursorShape)); } } } |