From 0064733679bdaa728eff51d272fd22a4bf8500bd Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 23 Jul 2023 08:45:14 -0500 Subject: [PATCH] Placefile fixes for Linux/gcc --- scwx-qt/source/scwx/qt/map/placefile_layer.cpp | 7 +++++-- scwx-qt/source/scwx/qt/model/placefile_model.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scwx-qt/source/scwx/qt/map/placefile_layer.cpp b/scwx-qt/source/scwx/qt/map/placefile_layer.cpp index 55b275e3..31eb1f46 100644 --- a/scwx-qt/source/scwx/qt/map/placefile_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/placefile_layer.cpp @@ -23,7 +23,7 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_); class PlacefileLayer::Impl { public: - explicit Impl(std::shared_ptr context) {}; + explicit Impl() {}; ~Impl() = default; void @@ -46,7 +46,7 @@ public: }; PlacefileLayer::PlacefileLayer(std::shared_ptr context) : - DrawLayer(context), p(std::make_unique(context)) + DrawLayer(context), p(std::make_unique()) { } @@ -168,6 +168,9 @@ void PlacefileLayer::Render( params, std::static_pointer_cast(drawItem)); break; + + default: + break; } } } diff --git a/scwx-qt/source/scwx/qt/model/placefile_model.cpp b/scwx-qt/source/scwx/qt/model/placefile_model.cpp index 6cfbe807..50b5ad73 100644 --- a/scwx-qt/source/scwx/qt/model/placefile_model.cpp +++ b/scwx-qt/source/scwx/qt/model/placefile_model.cpp @@ -74,7 +74,7 @@ Qt::ItemFlags PlacefileModel::flags(const QModelIndex& index) const QVariant PlacefileModel::data(const QModelIndex& index, int role) const { if (!index.isValid() || index.row() < 0 || - index.row() >= p->placefileNames_.size()) + static_cast(index.row()) >= p->placefileNames_.size()) { return QVariant(); }