blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 08:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Placefile fixes for Linux/gcc

Browse source
This commit is contained in:
Dan Paulat 2023-07-23 08:45:14 -05:00
parent 36dd2945b0
commit 0064733679
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scwx-qt/source/scwx/qt/map/placefile_layer.cpp
View file

@ -23,7 +23,7 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
class PlacefileLayer::Impl class PlacefileLayer::Impl
{ {
public: public:
explicit Impl(std::shared_ptr<MapContext> context) {}; explicit Impl() {};
~Impl() = default; ~Impl() = default;
void void
@ -46,7 +46,7 @@ public:
}; };
PlacefileLayer::PlacefileLayer(std::shared_ptr<MapContext> context) : PlacefileLayer::PlacefileLayer(std::shared_ptr<MapContext> context) :
DrawLayer(context), p(std::make_unique<PlacefileLayer::Impl>(context)) DrawLayer(context), p(std::make_unique<PlacefileLayer::Impl>())
{ {
} }
@ -168,6 +168,9 @@ void PlacefileLayer::Render(
params, params,
std::static_pointer_cast<gr::Placefile::TextDrawItem>(drawItem)); std::static_pointer_cast<gr::Placefile::TextDrawItem>(drawItem));
break; break;
default:
break;
} }
} }
} }

2
scwx-qt/source/scwx/qt/model/placefile_model.cpp
View file

@ -74,7 +74,7 @@ Qt::ItemFlags PlacefileModel::flags(const QModelIndex& index) const
QVariant PlacefileModel::data(const QModelIndex& index, int role) const QVariant PlacefileModel::data(const QModelIndex& index, int role) const
{ {
if (!index.isValid() || index.row() < 0 || if (!index.isValid() || index.row() < 0 ||
index.row() >= p->placefileNames_.size()) static_cast<std::size_t>(index.row()) >= p->placefileNames_.size())
{ {
return QVariant(); return QVariant();
} }