From acbfd6ec6b15110e20e229092edd88c55e99a5f0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 20 Mar 2021 21:57:47 +0100 Subject: [PATCH] Fix warnings --- gui/undocommands.cpp | 2 +- model/entrymodel.cpp | 8 ++++---- model/fieldmodel.cpp | 4 ++-- model/fieldmodel.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gui/undocommands.cpp b/gui/undocommands.cpp index 9620325..b290309 100644 --- a/gui/undocommands.cpp +++ b/gui/undocommands.cpp @@ -174,7 +174,7 @@ bool FieldModelRemoveRowsCommand::internalRedo() m_model->setAccountEntry(m_account); if (m_values.isEmpty()) { for (int row = m_row, end = m_row + m_count; row < end; ++row) { - if (const Field *field = m_model->field(row)) { + if (const Field *const field = m_model->field(static_cast(row))) { m_values << Field(*field); } } diff --git a/model/entrymodel.cpp b/model/entrymodel.cpp index 638e206..a9f5254 100644 --- a/model/entrymodel.cpp +++ b/model/entrymodel.cpp @@ -94,7 +94,7 @@ QList EntryModel::takeEntries(int row, int count, const QModelIndex &pa int lastIndex = row + count - 1; const vector &children = parentNodeEntry->children(); if (lastIndex < 0 || static_cast(lastIndex) >= children.size()) { - lastIndex = children.size() - 1; + lastIndex = static_cast(children.size() - 1); } beginRemoveRows(parent, row, lastIndex); for (int index = lastIndex; index >= row; --index) { @@ -125,7 +125,7 @@ bool EntryModel::insertEntries(int row, const QModelIndex &parent, const QList(parentEntry); const vector &children = parentNodeEntry->children(); if (row < 0 || static_cast(row) > children.size()) { - row = children.size(); + row = static_cast(children.size()); } beginInsertRows(parent, row, row + entries.size() - 1); for (Entry *const entry : entries) { @@ -243,7 +243,7 @@ QVariant EntryModel::data(const QModelIndex &index, int role) const entry->make(ss); // FIXME: make conversion to QByteArray more efficient const auto str(ss.str()); - return QByteArray(str.data(), str.size()); + return QByteArray(str.data(), static_cast(str.size())); } catch (const std::ios_base::failure &) { return false; } @@ -375,7 +375,7 @@ int EntryModel::rowCount(const QModelIndex &parent) const if (Entry *parentEntry = static_cast(parent.internalPointer())) { switch (parentEntry->type()) { case EntryType::Node: - return static_cast(parentEntry)->children().size(); + return static_cast(static_cast(parentEntry)->children().size()); case EntryType::Account:; } } diff --git a/model/fieldmodel.cpp b/model/fieldmodel.cpp index 2e426a8..844b0d1 100644 --- a/model/fieldmodel.cpp +++ b/model/fieldmodel.cpp @@ -89,7 +89,7 @@ inline QVariant FieldModel::passwordValue(const QModelIndex &index, int role) co return (m_passwordVisibility == PasswordVisibility::Always || role == Qt::EditRole || (*m_fields)[static_cast(index.row())].type() != FieldType::Password) ? QString::fromStdString((*m_fields)[static_cast(index.row())].value()) - : QString((*m_fields)[static_cast(index.row())].value().size(), QChar(0x2022)); + : QString(static_cast((*m_fields)[static_cast(index.row())].value().size()), QChar(0x2022)); } QVariant FieldModel::data(const QModelIndex &index, int role) const @@ -289,7 +289,7 @@ QVariant FieldModel::headerData(int section, Qt::Orientation orientation, int ro int FieldModel::rowCount(const QModelIndex &parent) const { - return (!parent.isValid() && m_fields) ? m_fields->size() + 1 : 0; + return (!parent.isValid() && m_fields) ? static_cast(m_fields->size()) + 1 : 0; } int FieldModel::columnCount(const QModelIndex &parent) const diff --git a/model/fieldmodel.h b/model/fieldmodel.h index 3ed3706..05ec002 100644 --- a/model/fieldmodel.h +++ b/model/fieldmodel.h @@ -141,7 +141,7 @@ inline void FieldModel::setPasswordVisibility(PasswordVisibility passwordVisibil { m_passwordVisibility = passwordVisibility; if (m_fields) { - emit dataChanged(index(0, 1), index(m_fields->size() - 1, 1), QVector({ Qt::DisplayRole, Qt::EditRole })); + emit dataChanged(index(0, 1), index(static_cast(m_fields->size() - 1), 1), QVector({ Qt::DisplayRole, Qt::EditRole })); } } } // namespace QtGui