diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 12:38:48 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 11:58:28 +0000 |
| commit | 017b7dff8b3e8ebfcd399409b3706afc170124f3 (patch) | |
| tree | 39ff3b37419f99bfd3a3060f1671e15e371f0907 | |
| parent | d54d3f3bd2e7dfd803ce8d97672934820edb0641 (diff) | |
QVirtualKeyboardSelectionListModel: Fix compiler warningsv5.13.0-alpha1
Replace static_cast<const int> by static_cast<int> and
change to an initializer list, fixing:
qvirtualkeyboardselectionlistmodel.cpp: In constructor 'QVirtualKeyboardSelectionListModel::QVirtualKeyboardSelectionListModel(QObject*)':
qvirtualkeyboardinputengine.cpp:434:68: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
if (d->inputModes.contains(static_cast<const int>(inputMode))) { ^
qvirtualkeyboardselectionlistmodel.cpp:150:50: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
qvirtualkeyboardselectionlistmodel.cpp:151:63: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
qvirtualkeyboardselectionlistmodel.cpp:152:53: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
qvirtualkeyboardselectionlistmodel.cpp:153:62: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
Change-Id: Ibd8b928b5f5326cc18e12be69c080cface1279fc
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp index c26d2a0b..69e8cfe1 100644 --- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp @@ -147,10 +147,11 @@ QVirtualKeyboardSelectionListModel::QVirtualKeyboardSelectionListModel(QObject * QAbstractListModel(*new QVirtualKeyboardSelectionListModelPrivate(), parent) { Q_D(QVirtualKeyboardSelectionListModel); - d->roles[static_cast<const int>(Role::Display)] = "display"; - d->roles[static_cast<const int>(Role::WordCompletionLength)] = "wordCompletionLength"; - d->roles[static_cast<const int>(Role::Dictionary)] = "dictionary"; - d->roles[static_cast<const int>(Role::CanRemoveSuggestion)] = "canRemoveSuggestion"; + d->roles = + {{static_cast<int>(Role::Display), "display"}, + {static_cast<int>(Role::WordCompletionLength), "wordCompletionLength"}, + {static_cast<int>(Role::Dictionary), "dictionary"}, + {static_cast<int>(Role::CanRemoveSuggestion), "canRemoveSuggestion"}}; } /*! |