diff options
| author | Sami Shalayel <sami.shalayel@qt.io> | 2023-01-11 17:11:19 +0100 |
|---|---|---|
| committer | Sami Shalayel <sami.shalayel@qt.io> | 2023-02-15 14:04:44 +0100 |
| commit | 68d6109707207dd0c63dc2f71814559c0750851a (patch) | |
| tree | 23851ebd86a9926cec8d8559bad926463336500c /src/quick/items | |
| parent | e81bd76e68ea818d7ea330bf7ae8f9a5fd4476ff (diff) | |
QQuickItemKeyFilter: do not overload shortcutOverride-signal
Renames the virtual shortcutOverride(QKeyEvent*) method of
QQuickItemKeyFilter and QQuickKeysAttached
to shortcutOverrideEvent to avoid overloading the
shortcutOverride(QQuickKeyEvent*)-signal of QQuickKeysAttached.
Signals should not be overloaded. Also, it makes code generation in
qmltc more complicated.
Task-number: QTBUG-110029
Change-Id: I1b2362a67095ade085a829e51c2d309a2f7c50af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 8 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 199ffbb990..67b28b64d1 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -319,10 +319,10 @@ QVariant QQuickItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const } #endif // im -void QQuickItemKeyFilter::shortcutOverride(QKeyEvent *event) +void QQuickItemKeyFilter::shortcutOverrideEvent(QKeyEvent *event) { if (m_next) - m_next->shortcutOverride(event); + m_next->shortcutOverrideEvent(event); else event->ignore(); } @@ -1385,7 +1385,7 @@ QVariant QQuickKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const } #endif // im -void QQuickKeysAttached::shortcutOverride(QKeyEvent *event) +void QQuickKeysAttached::shortcutOverrideEvent(QKeyEvent *event) { Q_D(QQuickKeysAttached); QQuickKeyEvent &keyEvent = d->theKeyEvent; @@ -5542,7 +5542,7 @@ void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e) void QQuickItemPrivate::deliverShortcutOverrideEvent(QKeyEvent *event) { if (extra.isAllocated() && extra->keyHandler) - extra->keyHandler->shortcutOverride(event); + extra->keyHandler->shortcutOverrideEvent(event); else event->ignore(); } diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 4042d6efa5..f98a5b2336 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -720,7 +720,7 @@ public: virtual void inputMethodEvent(QInputMethodEvent *event, bool post); virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const; #endif - virtual void shortcutOverride(QKeyEvent *event); + virtual void shortcutOverrideEvent(QKeyEvent *event); virtual void componentComplete(); bool m_processPost; @@ -978,7 +978,7 @@ private: void inputMethodEvent(QInputMethodEvent *, bool post) override; QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; #endif - void shortcutOverride(QKeyEvent *event) override; + void shortcutOverrideEvent(QKeyEvent *event) override; static QByteArray keyToSignal(int key); bool isConnected(const char *signalName) const; |