Mercurial > octave
changeset 29051:9893a8771a97 stable
use QMultiHash instead of QHash to store multiple entries with same key
* KeyboardTranslator.h, KeyboardTranslator.cpp
(KeyboardTranslator::_entries): Declare as QMultiHash. Use insert
instead of insertMulti to insert items in the _entries hash table.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 12 Nov 2020 01:15:59 -0500 |
| parents | ce849f006568 |
| children | 6ecc75589cbc |
| files | libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp libgui/qterminal/libqterminal/unix/KeyboardTranslator.h |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp Thu Nov 12 00:49:59 2020 -0500 +++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp Thu Nov 12 01:15:59 2020 -0500 @@ -829,13 +829,13 @@ void KeyboardTranslator::addEntry(const Entry& entry) { const int keyCode = entry.keyCode(); - _entries.insertMulti(keyCode,entry); + _entries.insert(keyCode,entry); } void KeyboardTranslator::replaceEntry(const Entry& existing , const Entry& replacement) { if ( !existing.isNull() ) _entries.remove(existing.keyCode()); - _entries.insertMulti(replacement.keyCode(),replacement); + _entries.insert(replacement.keyCode(),replacement); } void KeyboardTranslator::removeEntry(const Entry& entry) {
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h Thu Nov 12 00:49:59 2020 -0500 +++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h Thu Nov 12 01:15:59 2020 -0500 @@ -26,6 +26,7 @@ // Qt #include <QtCore/QHash> +#include <QtCore/QMultiHash> #include <QtCore/QList> #include <QKeySequence> #include <QtCore/QMetaType> @@ -383,7 +384,7 @@ private: - QHash<int,Entry> _entries; // entries in this keyboard translation, + QMultiHash<int,Entry> _entries; // entries in this keyboard translation, // entries are indexed according to // their keycode QString _name;