diff options
Diffstat (limited to 'src/gui/kernel/qshortcut.cpp')
-rw-r--r-- | src/gui/kernel/qshortcut.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp index eccbb5b873..3f6822cb03 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/kernel/qshortcut.cpp @@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE \sa activated() */ -static bool simpleContextMatcher(QObject *object, Qt::ShortcutContext context) +bool QShortcutPrivate::simpleContextMatcher(QObject *object, Qt::ShortcutContext context) { auto guiShortcut = qobject_cast<QShortcut *>(object); if (QGuiApplication::applicationState() != Qt::ApplicationActive || guiShortcut == nullptr) @@ -127,14 +127,14 @@ void QShortcutPrivate::redoGrab(QShortcutMap &map) return; } - for (int id : qAsConst(sc_ids)) + for (int id : std::as_const(sc_ids)) map.removeShortcut(id, q); sc_ids.clear(); if (sc_sequences.isEmpty()) return; - sc_ids.reserve(sc_sequences.count()); - for (const auto &keySequence : qAsConst(sc_sequences)) { + sc_ids.reserve(sc_sequences.size()); + for (const auto &keySequence : std::as_const(sc_sequences)) { if (keySequence.isEmpty()) continue; int id = map.addShortcut(q, keySequence, sc_context, contextMatcher()); @@ -337,7 +337,7 @@ QShortcut::~QShortcut() { Q_D(QShortcut); if (qApp) { - for (int id : qAsConst(d->sc_ids)) + for (int id : std::as_const(d->sc_ids)) QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this); } } @@ -536,6 +536,8 @@ QString QShortcut::whatsThis() const /*! Returns the primary key binding's ID. + \deprecated + \sa QShortcutEvent::shortcutId() */ int QShortcut::id() const |