Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / GuiIdListModel.cpp

diff --git a/src/frontends/qt4/GuiIdListModel.cpp b/src/frontends/qt4/GuiIdListModel.cpp
index c80e57349353c0568f0e2307adeb3369f3985610..d38a087f7c37a4ec82357244f540c77613cef642 100644 (file)
--- a/src/frontends/qt4/GuiIdListModel.cpp
+++ b/src/frontends/qt4/GuiIdListModel.cpp
@@ -31,38 +31,45 @@ QVariant GuiIdListModel::data(QModelIndex const & index, int role) const
        if (!rowIsValid(row))
                return QVariant();
        if (role == Qt::DisplayRole || role == Qt::EditRole)
-               return userData_[row].uiString;
+               return userData_[ulong(row)].uiString;
        if (role == Qt::ToolTipRole) {
-               QString const ttstr = userData_[row].ttString.toString();
-               return !ttstr.isEmpty() ? ttstr : userData_[row].uiString;
+               QString const ttstr = userData_[ulong(row)].ttString.toString();
+               return !ttstr.isEmpty() ? ttstr : userData_[ulong(row)].uiString;
        }
        if (role == Qt::UserRole)
-               return userData_[row].idString;
+               return userData_[ulong(row)].idString;
        return QVariant();
 }
 
 
-bool GuiIdListModel::setData (QModelIndex const & index,
+bool GuiIdListModel::setData(QModelIndex const & index,
                const QVariant & value, int role)
 {
        int const row = index.row();
        if (!rowIsValid(row))
                return false;
        if (role == Qt::DisplayRole || role == Qt::EditRole) {
-               userData_[row].uiString = value;
+               userData_[ulong(row)].uiString = value;
                dataChanged(index, index);
                return true;
        }
        if (role == Qt::UserRole) {
-               userData_[row].idString = value;
+               userData_[ulong(row)].idString = value;
                dataChanged(index, index);
                return true;
        }
        if (role == Qt::ToolTipRole) {
-               userData_[row].ttString = value;
+               userData_[ulong(row)].ttString = value;
                dataChanged(index, index);
                return true;
        }
+       if (role == Qt::DecorationRole)
+               // nothing to do
+               return true;
+       if (role == Qt::UserRole - 1)
+               // This role is set by Qt <= 5.5 if setEditable()
+               // of the item is false
+               return true;
        // If we assert here, it's because we're trying to set an
        // unrecognized role.
        LATTEST(false);
@@ -77,7 +84,7 @@ bool GuiIdListModel::insertRows(int row, int count,
                return false;
        vector<OurData>::iterator it = userData_.begin() + row;
        beginInsertRows(QModelIndex(), row, row + count - 1);
-       userData_.insert(it, count, OurData());
+       userData_.insert(it, ulong(count), OurData());
        endInsertRows();
        return true;
 }
@@ -122,7 +129,7 @@ QMap<int, QVariant> GuiIdListModel::itemData(QModelIndex const & index) const
        if (!rowIsValid(row))
                return QMap<int, QVariant>();
        QMap<int, QVariant> qm = QAbstractListModel::itemData(index);
-       qm[Qt::UserRole] = userData_[row].idString;
+       qm[Qt::UserRole] = userData_[ulong(row)].idString;
        return qm;
 }