diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-04-21 14:46:25 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-04-29 18:03:40 +0200 |
commit | 4f72db2fce963bb43dcf369673f702a90e829712 (patch) | |
tree | 7398cb4d314d6e094c2c4389507fc5a51a7dd705 | |
parent | 3aeeb8d113f740293435bae3ee1c7316fb984a60 (diff) |
Remove noop calls to QPlatformInputContext base class
Like most QPlatformFoo base classes the default implementations are
empty, or have default behavior that should be completely replaced
by subclasses.
By making it consistent across all the platform plugins when we call
base class methods, we avoid confusion of whether a base class call
is needed or not.
Change-Id: Idd8e4a6fa0e24a1dffd21b63471c9b1c2348691f
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
4 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index b3fb88c907..900482470d 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -180,8 +180,6 @@ void QIBusPlatformInputContext::invokeAction(QInputMethod::Action a, int) void QIBusPlatformInputContext::reset() { - QPlatformInputContext::reset(); - if (!d->busConnected) return; @@ -192,8 +190,6 @@ void QIBusPlatformInputContext::reset() void QIBusPlatformInputContext::commit() { - QPlatformInputContext::commit(); - if (!d->busConnected) return; @@ -242,7 +238,6 @@ void QIBusPlatformInputContext::update(Qt::InputMethodQueries q) d->context->SetSurroundingText(dbusText, cursorPosition, anchorPosition); } - QPlatformInputContext::update(q); } void QIBusPlatformInputContext::cursorRectChanged() diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 0cce19534b..fb57f5423d 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -979,7 +979,6 @@ void QAndroidInputContext::setFocusObject(QObject *object) m_focusObject = object; reset(); } - QPlatformInputContext::setFocusObject(object); updateSelectionHandles(); } diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm index 265a8e133f..f6ddd4242a 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm @@ -136,8 +136,6 @@ void QCocoaInputContext::reset() { qCDebug(lcQpaInputMethods) << "Resetting input method"; - QPlatformInputContext::reset(); - if (!m_focusWindow) return; diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp index 4cda4e1efe..31082e8290 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp @@ -197,7 +197,6 @@ bool QWindowsInputContext::hasCapability(Capability capability) const void QWindowsInputContext::reset() { - QPlatformInputContext::reset(); if (!m_compositionContext.hwnd) return; qCDebug(lcQpaInputMethods) << __FUNCTION__; @@ -335,7 +334,6 @@ void QWindowsInputContext::update(Qt::InputMethodQueries queries) { if (queries & Qt::ImEnabled) updateEnabled(); - QPlatformInputContext::update(queries); } void QWindowsInputContext::cursorRectChanged() |