Commit 5525f77d authored by Martin Kröning's avatar Martin Kröning

Backport to dependencies found in Ubuntu 18.04

parent 881e8d0a
project('pi2-view', ['cpp', 'c'], project('pi2-view', ['cpp', 'c'],
license: 'GPL3', license: 'GPL3',
meson_version: '>=0.47.0', meson_version: '>=0.45.1',
version: '0.1', version: '0.1',
default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++17', 'c_std=c11'] default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++17', 'c_std=c11']
) )
......
...@@ -13,7 +13,7 @@ ui_resources = gnome.compile_resources( ...@@ -13,7 +13,7 @@ ui_resources = gnome.compile_resources(
'pi2-view-resources', 'data/pi2-view.gresource.xml', 'pi2-view-resources', 'data/pi2-view.gresource.xml',
source_dir: 'data' source_dir: 'data'
) )
gtkmm_dep = dependency('gtkmm-3.0', version : '>=3.24.0') gtkmm_dep = dependency('gtkmm-3.0', version : '>=3.22.2')
thread_dep = dependency('threads') thread_dep = dependency('threads')
pi2_view_lib = shared_library('pi2-view', [pi2_view_src, ui_resources], pi2_view_lib = shared_library('pi2-view', [pi2_view_src, ui_resources],
dependencies : [gtkmm_dep, thread_dep, microsoft_gsl_dep], dependencies : [gtkmm_dep, thread_dep, microsoft_gsl_dep],
......
...@@ -233,9 +233,11 @@ void MapApp::addOrReplaceVehicle(const std::string &vehicleName, ...@@ -233,9 +233,11 @@ void MapApp::addOrReplaceVehicle(const std::string &vehicleName,
} }
if (insertion.second) { if (insertion.second) {
auto *label = Gtk::make_managed<Gtk::Label>(); // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
auto *label = Gtk::manage(new Gtk::Label());
label->set_text(vehicleName); label->set_text(vehicleName);
auto *listBoxRow = Gtk::make_managed<Gtk::ListBoxRow>(); // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
auto *listBoxRow = Gtk::manage(new Gtk::ListBoxRow());
listBoxRow->add(*label); listBoxRow->add(*label);
listBox->append(*listBoxRow); listBox->append(*listBoxRow);
listBox->show_all_children(); listBox->show_all_children();
......
...@@ -58,9 +58,12 @@ bool MapArea::on_draw(const Cairo::RefPtr<Cairo::Context> &cr) { ...@@ -58,9 +58,12 @@ bool MapArea::on_draw(const Cairo::RefPtr<Cairo::Context> &cr) {
junction.draw(cr); junction.draw(cr);
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
for (auto &&[name, vehicle] : nameVehicleMap) { for (auto &&[name, vehicle] : nameVehicleMap) {
vehicle.draw(cr); vehicle.draw(cr);
} }
#pragma GCC diagnostic pop
return true; return true;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment