Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix shadowing warning

This commit is contained in:
Martchus 2021-08-22 00:02:48 +02:00
parent 3a01f2de31
commit 641e02f64c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(META_USE_QQC2 ON)
set(META_ANDROID_PACKAGE_NAME "org.martchus.passwordmanager") set(META_ANDROID_PACKAGE_NAME "org.martchus.passwordmanager")
set(META_VERSION_MAJOR 4) set(META_VERSION_MAJOR 4)
set(META_VERSION_MINOR 1) set(META_VERSION_MINOR 1)
set(META_VERSION_PATCH 8) set(META_VERSION_PATCH 9)
# add project files # add project files
set(HEADER_FILES cli/cli.h model/entryfiltermodel.h model/entrymodel.h model/fieldmodel.h) set(HEADER_FILES cli/cli.h model/entryfiltermodel.h model/entrymodel.h model/fieldmodel.h)

6
model/fieldmodel.cpp
View File

@ -155,14 +155,14 @@ QVariant FieldModel::data(const QModelIndex &index, int role) const
QMap<int, QVariant> FieldModel::itemData(const QModelIndex &index) const QMap<int, QVariant> FieldModel::itemData(const QModelIndex &index) const
{ {
static const auto roleMap = [this, index] { static const auto roleMap = [this, index] {
QMap<int, QVariant> roleMap; auto res = QMap<int, QVariant>();
for (const auto role : initializer_list<int>{ Qt::EditRole, FieldTypeRole }) { for (const auto role : initializer_list<int>{ Qt::EditRole, FieldTypeRole }) {
const auto variantData(data(index, role)); const auto variantData(data(index, role));
if (variantData.isValid()) { if (variantData.isValid()) {
roleMap.insert(role, variantData); res.insert(role, variantData);
} }
} }
return roleMap; return res;
}(); }();
return roleMap; return roleMap;
} }