summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-10-13 15:05:05 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-10-13 15:09:26 +0200
commit9a0822c445e56580fb3034224191ec825ea0274a (patch)
tree9fce6a93bb72a0db6b60015b58272abe0fba68ba /gui
parent887dd41c5d67c30bd1e9631920d8fc1c3dd1a3f0 (diff)
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.
Diffstat (limited to 'gui')
-rw-r--r--gui/main-window.cpp6
-rw-r--r--gui/mapping-window.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index 51e22861..6a7be89f 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -115,17 +115,17 @@ MainWindow::MainWindow() :
// dylibs
{
connect(&m.tracker_dll,
- static_cast<void(base_value::*)(const QString&) const>(&base_value::valueChanged),
+ base_value::signal_fun<QString>(),
this,
[&](const QString&) { if (pTrackerDialog) pTrackerDialog = nullptr; save_modules(); });
connect(&m.protocol_dll,
- static_cast<void(base_value::*)(const QString&) const>(&base_value::valueChanged),
+ base_value::signal_fun<QString>(),
this,
[&](const QString&) { if (pProtocolDialog) pProtocolDialog = nullptr; save_modules(); });
connect(&m.filter_dll,
- static_cast<void(base_value::*)(const QString&) const>(&base_value::valueChanged),
+ base_value::signal_fun<QString>(),
this,
[&](const QString&) { if (pFilterDialog) pFilterDialog = nullptr; save_modules(); });
}
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<void(base_value::*)(bool) const>(&base_value::valueChanged),
+ base_value::signal_fun<bool>(),
this,
[&](bool f) -> void {qfc.setEnabled(f); qfc.force_redraw();});
qfc.setEnabled(axis.opts.altp);
qfc.force_redraw();
}
- connect(&axis.opts.clamp, static_cast<void(base_value::*)(int) const>(&base_value::valueChanged),
+ connect(&axis.opts.clamp, base_value::signal_fun<int>(),
&qfc, [i, &conf, &qfc](int value) {
conf.set_max_input(value);
qfc.reload_spline();