From 822b917bf771be29282acd900bc4b0ce56a88d4a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 4 Dec 2020 21:08:23 +0000 Subject: [PATCH] remove unused QShortcutMap methods Signed-off-by: Ivailo Monev --- src/gui/kernel/qshortcutmap.cpp | 35 ----------------------------------- src/gui/kernel/qshortcutmap_p.h | 3 --- 2 files changed, 38 deletions(-) diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 1095da471..f540193b8 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -292,15 +292,6 @@ void QShortcutMap::resetState() } /*! \internal - Returns the current state of the statemachine -*/ -QKeySequence::SequenceMatch QShortcutMap::state() -{ - Q_D(QShortcutMap); - return d->currentState; -} - -/*! \internal Uses ShortcutOverride event to see if any widgets want to override the event. If not, uses nextState(QKeyEvent) to check for a grabbed Shortcut, and dispatchEvent() is found an identical. @@ -786,32 +777,6 @@ bool QShortcutMap::correctContext(Qt::ShortcutContext context, QAction *a, QWidg #endif // QT_NO_ACTION /*! \internal - Converts keyboard button states into modifier states -*/ -int QShortcutMap::translateModifiers(Qt::KeyboardModifiers modifiers) -{ - int result = 0; - if (modifiers & Qt::ShiftModifier) - result |= Qt::SHIFT; - if (modifiers & Qt::ControlModifier) - result |= Qt::CTRL; - if (modifiers & Qt::MetaModifier) - result |= Qt::META; - if (modifiers & Qt::AltModifier) - result |= Qt::ALT; - return result; -} - -/*! \internal - Returns the vector of QShortcutEntry's matching the last Identical state. -*/ -QVector QShortcutMap::matches() const -{ - Q_D(const QShortcutMap); - return d->identicals; -} - -/*! \internal Dispatches QShortcutEvents to widgets who grabbed the matched key sequence. */ void QShortcutMap::dispatchEvent(QKeyEvent *e) diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h index 157cc1a9b..956716785 100644 --- a/src/gui/kernel/qshortcutmap_p.h +++ b/src/gui/kernel/qshortcutmap_p.h @@ -78,7 +78,6 @@ public: void resetState(); QKeySequence::SequenceMatch nextState(QKeyEvent *e); - QKeySequence::SequenceMatch state(); void dispatchEvent(QKeyEvent *e); bool tryShortcutEvent(QObject *o, QKeyEvent *e); @@ -101,11 +100,9 @@ private: QKeySequence::SequenceMatch find(QKeyEvent *e); QKeySequence::SequenceMatch matches(const QKeySequence &seq1, const QKeySequence &seq2) const; - QVector matches() const; void createNewSequences(QKeyEvent *e, QVector &ksl); void clearSequence(QVector &ksl); bool correctContext(const QShortcutEntry &item) const; - int translateModifiers(Qt::KeyboardModifiers modifiers); }; #endif // QT_NO_SHORTCUT -- 2.11.0