anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve some implicit conversion warnings.

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-04-05 11:47:59 +02:00
parent a42376bea9
commit fa79ff2db2
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/frontends/qt4/GuiIdListModel.cpp
View File

@ -31,13 +31,13 @@ QVariant GuiIdListModel::data(QModelIndex const & index, int role) const
if (!rowIsValid(row)) if (!rowIsValid(row))
return QVariant(); return QVariant();
if (role == Qt::DisplayRole || role == Qt::EditRole) if (role == Qt::DisplayRole || role == Qt::EditRole)
return userData_[row].uiString; return userData_[ulong(row)].uiString;
if (role == Qt::ToolTipRole) { if (role == Qt::ToolTipRole) {
QString const ttstr = userData_[row].ttString.toString(); QString const ttstr = userData_[ulong(row)].ttString.toString();
return !ttstr.isEmpty() ? ttstr : userData_[row].uiString; return !ttstr.isEmpty() ? ttstr : userData_[ulong(row)].uiString;
} }
if (role == Qt::UserRole) if (role == Qt::UserRole)
return userData_[row].idString; return userData_[ulong(row)].idString;
return QVariant(); return QVariant();
} }
@ -49,17 +49,17 @@ bool GuiIdListModel::setData (QModelIndex const & index,
if (!rowIsValid(row)) if (!rowIsValid(row))
return false; return false;
if (role == Qt::DisplayRole || role == Qt::EditRole) { if (role == Qt::DisplayRole || role == Qt::EditRole) {
userData_[row].uiString = value; userData_[ulong(row)].uiString = value;
dataChanged(index, index); dataChanged(index, index);
return true; return true;
} }
if (role == Qt::UserRole) { if (role == Qt::UserRole) {
userData_[row].idString = value; userData_[ulong(row)].idString = value;
dataChanged(index, index); dataChanged(index, index);
return true; return true;
} }
if (role == Qt::ToolTipRole) { if (role == Qt::ToolTipRole) {
userData_[row].ttString = value; userData_[ulong(row)].ttString = value;
dataChanged(index, index); dataChanged(index, index);
return true; return true;
} }
@ -77,7 +77,7 @@ bool GuiIdListModel::insertRows(int row, int count,
return false; return false;
vector<OurData>::iterator it = userData_.begin() + row; vector<OurData>::iterator it = userData_.begin() + row;
beginInsertRows(QModelIndex(), row, row + count - 1); beginInsertRows(QModelIndex(), row, row + count - 1);
userData_.insert(it, count, OurData()); userData_.insert(it, ulong(count), OurData());
endInsertRows(); endInsertRows();
return true; return true;
} }
@ -122,7 +122,7 @@ QMap<int, QVariant> GuiIdListModel::itemData(QModelIndex const & index) const
if (!rowIsValid(row)) if (!rowIsValid(row))
return QMap<int, QVariant>(); return QMap<int, QVariant>();
QMap<int, QVariant> qm = QAbstractListModel::itemData(index); QMap<int, QVariant> qm = QAbstractListModel::itemData(index);
qm[Qt::UserRole] = userData_[row].idString; qm[Qt::UserRole] = userData_[ulong(row)].idString;
return qm; return qm;
} }

2
src/frontends/qt4/GuiIdListModel.h
View File

@ -45,7 +45,7 @@ public:
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
/// ///
int rowCount(QModelIndex const & = QModelIndex()) const int rowCount(QModelIndex const & = QModelIndex()) const
{ return userData_.size(); } { return int(userData_.size()); }
/// ///
virtual QVariant data(QModelIndex const & index, virtual QVariant data(QModelIndex const & index,