+ fix compiler warnings (signed/unsigned comp)
This commit is contained in:
parent
06f0ed47e2
commit
aa7fc86acd
1 changed files with 3 additions and 3 deletions
|
@ -41,7 +41,7 @@ QVariant LayerListModel::data(QModelIndex const& index,int role) const
|
||||||
{
|
{
|
||||||
if (!index.isValid() || !map_)
|
if (!index.isValid() || !map_)
|
||||||
return QVariant();
|
return QVariant();
|
||||||
if (index.row() < 0 || index.row() >= map_->layers().size())
|
if (index.row() < 0 || index.row() >= int(map_->layers().size()))
|
||||||
return QVariant();
|
return QVariant();
|
||||||
if (role == Qt::DisplayRole)
|
if (role == Qt::DisplayRole)
|
||||||
return QString(map_->layers().at(index.row()).name().c_str());
|
return QString(map_->layers().at(index.row()).name().c_str());
|
||||||
|
@ -112,7 +112,7 @@ boost::optional<mapnik::layer&> LayerListModel::map_layer(int i)
|
||||||
if (map_)
|
if (map_)
|
||||||
{
|
{
|
||||||
std::vector<mapnik::layer> & layers = const_cast<std::vector<mapnik::layer>& >(map_->layers());
|
std::vector<mapnik::layer> & layers = const_cast<std::vector<mapnik::layer>& >(map_->layers());
|
||||||
if (i < layers.size())
|
if (i < int(layers.size()))
|
||||||
return boost::optional<mapnik::layer&>(layers[i]);
|
return boost::optional<mapnik::layer&>(layers[i]);
|
||||||
}
|
}
|
||||||
return boost::optional<mapnik::layer&>();
|
return boost::optional<mapnik::layer&>();
|
||||||
|
|
Loading…
Reference in a new issue