From 9a0822c445e56580fb3034224191ec825ea0274a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 13 Oct 2017 15:05:05 +0200 Subject: options/tie: change "tie" overloads Adjust usages. There are ODR issues with MSVC and it doesn't support C++17 "static inline constexpr" _variables_. Otherwise, "signal_fun" could be a variable and not a function. The usages in accela/ewma2 dialog are more verbose now but the original API was silly. --- gui/mapping-window.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gui/mapping-window.cpp') diff --git a/gui/mapping-window.cpp b/gui/mapping-window.cpp index 0d2c9fbb..127929fe 100644 --- a/gui/mapping-window.cpp +++ b/gui/mapping-window.cpp @@ -109,14 +109,14 @@ void MapWidget::load() if (altp) { connect(&axis.opts.altp, - static_cast(&base_value::valueChanged), + base_value::signal_fun(), this, [&](bool f) -> void {qfc.setEnabled(f); qfc.force_redraw();}); qfc.setEnabled(axis.opts.altp); qfc.force_redraw(); } - connect(&axis.opts.clamp, static_cast(&base_value::valueChanged), + connect(&axis.opts.clamp, base_value::signal_fun(), &qfc, [i, &conf, &qfc](int value) { conf.set_max_input(value); qfc.reload_spline(); -- cgit v1.2.3