Fix warnings
This commit is contained in:
parent
4c85e7710b
commit
acbfd6ec6b
|
@ -174,7 +174,7 @@ bool FieldModelRemoveRowsCommand::internalRedo()
|
||||||
m_model->setAccountEntry(m_account);
|
m_model->setAccountEntry(m_account);
|
||||||
if (m_values.isEmpty()) {
|
if (m_values.isEmpty()) {
|
||||||
for (int row = m_row, end = m_row + m_count; row < end; ++row) {
|
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<std::size_t>(row))) {
|
||||||
m_values << Field(*field);
|
m_values << Field(*field);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,7 +94,7 @@ QList<Entry *> EntryModel::takeEntries(int row, int count, const QModelIndex &pa
|
||||||
int lastIndex = row + count - 1;
|
int lastIndex = row + count - 1;
|
||||||
const vector<Entry *> &children = parentNodeEntry->children();
|
const vector<Entry *> &children = parentNodeEntry->children();
|
||||||
if (lastIndex < 0 || static_cast<size_t>(lastIndex) >= children.size()) {
|
if (lastIndex < 0 || static_cast<size_t>(lastIndex) >= children.size()) {
|
||||||
lastIndex = children.size() - 1;
|
lastIndex = static_cast<int>(children.size() - 1);
|
||||||
}
|
}
|
||||||
beginRemoveRows(parent, row, lastIndex);
|
beginRemoveRows(parent, row, lastIndex);
|
||||||
for (int index = lastIndex; index >= row; --index) {
|
for (int index = lastIndex; index >= row; --index) {
|
||||||
|
@ -125,7 +125,7 @@ bool EntryModel::insertEntries(int row, const QModelIndex &parent, const QList<E
|
||||||
NodeEntry *const parentNodeEntry = static_cast<NodeEntry *>(parentEntry);
|
NodeEntry *const parentNodeEntry = static_cast<NodeEntry *>(parentEntry);
|
||||||
const vector<Entry *> &children = parentNodeEntry->children();
|
const vector<Entry *> &children = parentNodeEntry->children();
|
||||||
if (row < 0 || static_cast<size_t>(row) > children.size()) {
|
if (row < 0 || static_cast<size_t>(row) > children.size()) {
|
||||||
row = children.size();
|
row = static_cast<int>(children.size());
|
||||||
}
|
}
|
||||||
beginInsertRows(parent, row, row + entries.size() - 1);
|
beginInsertRows(parent, row, row + entries.size() - 1);
|
||||||
for (Entry *const entry : entries) {
|
for (Entry *const entry : entries) {
|
||||||
|
@ -243,7 +243,7 @@ QVariant EntryModel::data(const QModelIndex &index, int role) const
|
||||||
entry->make(ss);
|
entry->make(ss);
|
||||||
// FIXME: make conversion to QByteArray more efficient
|
// FIXME: make conversion to QByteArray more efficient
|
||||||
const auto str(ss.str());
|
const auto str(ss.str());
|
||||||
return QByteArray(str.data(), str.size());
|
return QByteArray(str.data(), static_cast<QByteArray::size_type>(str.size()));
|
||||||
} catch (const std::ios_base::failure &) {
|
} catch (const std::ios_base::failure &) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -375,7 +375,7 @@ int EntryModel::rowCount(const QModelIndex &parent) const
|
||||||
if (Entry *parentEntry = static_cast<Entry *>(parent.internalPointer())) {
|
if (Entry *parentEntry = static_cast<Entry *>(parent.internalPointer())) {
|
||||||
switch (parentEntry->type()) {
|
switch (parentEntry->type()) {
|
||||||
case EntryType::Node:
|
case EntryType::Node:
|
||||||
return static_cast<NodeEntry *>(parentEntry)->children().size();
|
return static_cast<int>(static_cast<NodeEntry *>(parentEntry)->children().size());
|
||||||
case EntryType::Account:;
|
case EntryType::Account:;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,7 +89,7 @@ inline QVariant FieldModel::passwordValue(const QModelIndex &index, int role) co
|
||||||
return (m_passwordVisibility == PasswordVisibility::Always || role == Qt::EditRole
|
return (m_passwordVisibility == PasswordVisibility::Always || role == Qt::EditRole
|
||||||
|| (*m_fields)[static_cast<size_t>(index.row())].type() != FieldType::Password)
|
|| (*m_fields)[static_cast<size_t>(index.row())].type() != FieldType::Password)
|
||||||
? QString::fromStdString((*m_fields)[static_cast<size_t>(index.row())].value())
|
? QString::fromStdString((*m_fields)[static_cast<size_t>(index.row())].value())
|
||||||
: QString((*m_fields)[static_cast<size_t>(index.row())].value().size(), QChar(0x2022));
|
: QString(static_cast<QString::size_type>((*m_fields)[static_cast<size_t>(index.row())].value().size()), QChar(0x2022));
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant FieldModel::data(const QModelIndex &index, int role) const
|
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
|
int FieldModel::rowCount(const QModelIndex &parent) const
|
||||||
{
|
{
|
||||||
return (!parent.isValid() && m_fields) ? m_fields->size() + 1 : 0;
|
return (!parent.isValid() && m_fields) ? static_cast<int>(m_fields->size()) + 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int FieldModel::columnCount(const QModelIndex &parent) const
|
int FieldModel::columnCount(const QModelIndex &parent) const
|
||||||
|
|
|
@ -141,7 +141,7 @@ inline void FieldModel::setPasswordVisibility(PasswordVisibility passwordVisibil
|
||||||
{
|
{
|
||||||
m_passwordVisibility = passwordVisibility;
|
m_passwordVisibility = passwordVisibility;
|
||||||
if (m_fields) {
|
if (m_fields) {
|
||||||
emit dataChanged(index(0, 1), index(m_fields->size() - 1, 1), QVector<int>({ Qt::DisplayRole, Qt::EditRole }));
|
emit dataChanged(index(0, 1), index(static_cast<int>(m_fields->size() - 1), 1), QVector<int>({ Qt::DisplayRole, Qt::EditRole }));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // namespace QtGui
|
} // namespace QtGui
|
||||||
|
|
Loading…
Reference in New Issue