diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-18 17:01:20 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-18 17:05:12 +0200 |
| commit | 132a1925340bcd75a88f831a3487044736dccb4a (patch) | |
| tree | d741f42c413631a6923b7b674b784d3648ff5f94 | |
| parent | ac3878aaada9886de097aee7b0041468590f50d1 (diff) | |
options: add base_value signal const
| -rw-r--r-- | gui/main-window.cpp | 2 | ||||
| -rw-r--r-- | gui/options-dialog.cpp | 2 | ||||
| -rw-r--r-- | options/tie.hpp | 4 | ||||
| -rw-r--r-- | options/value.hpp | 2 | ||||
| -rw-r--r-- | proto-ft/ftnoir_protocol_ft.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/gui/main-window.cpp b/gui/main-window.cpp index 7de95f98..a1e86863 100644 --- a/gui/main-window.cpp +++ b/gui/main-window.cpp @@ -127,7 +127,7 @@ MainWindow::MainWindow() : init_tray_menu(); connect(&s.tray_enabled, - static_cast<void (base_value::*)(bool)>(&base_value::valueChanged), + static_cast<void (base_value::*)(bool) const>(&base_value::valueChanged), this, [&](bool) { ensure_tray(); }); ensure_tray(); diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp index 3f051c9f..3c3012b5 100644 --- a/gui/options-dialog.cpp +++ b/gui/options-dialog.cpp @@ -100,7 +100,7 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) : tmp val = val_; val.label->setText(kopts_to_string(val.opt)); connect(&val.opt.keycode, - static_cast<void (base_value::*)(const QString&)>(&base_value::valueChanged), + static_cast<void (base_value::*)(const QString&) const>(&base_value::valueChanged), val.label, [=](const QString&) -> void { val.label->setText(kopts_to_string(val.opt)); }); { diff --git a/options/tie.hpp b/options/tie.hpp index 2969f8d4..1b8056a7 100644 --- a/options/tie.hpp +++ b/options/tie.hpp @@ -91,7 +91,7 @@ tie_setting(value<t>& v, QComboBox* cb) fn1(v, cb, enum_cases), v.DIRECT_CONNTYPE); base_value::connect(&v, - static_cast<void (base_value::*)(int)>(&base_value::valueChanged), + static_cast<void (base_value::*)(int) const>(&base_value::valueChanged), cb, fn2(v, cb, enum_cases), v.DIRECT_CONNTYPE); @@ -203,7 +203,7 @@ inline void tie_setting(value<slider_value>& v, QSlider* w) }, v.DIRECT_CONNTYPE); base_value::connect(&v, - static_cast<void(base_value::*)(double)>(&base_value::valueChanged), + static_cast<void(base_value::*)(double) const>(&base_value::valueChanged), w, [=](double value) { w->setValue(int(round(value * q_diff) + q_min)); }, v.SAFE_CONNTYPE); diff --git a/options/value.hpp b/options/value.hpp index 4d8d69f8..d09924c5 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -8,7 +8,7 @@ #include <QList> #define OPENTRACK_DEFINE_SLOT(t) void setValue(t datum) { store(datum); } -#define OPENTRACK_DEFINE_SIGNAL(t) void valueChanged(t) +#define OPENTRACK_DEFINE_SIGNAL(t) void valueChanged(t) const namespace options { namespace detail { diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp index 7cd0b5f7..6a2d1cb2 100644 --- a/proto-ft/ftnoir_protocol_ft.cpp +++ b/proto-ft/ftnoir_protocol_ft.cpp @@ -22,7 +22,7 @@ FTNoIR_Protocol::FTNoIR_Protocol() : { runonce_check.set_enabled(s.close_protocols_on_exit); QObject::connect(&s.close_protocols_on_exit, - static_cast<void (base_value::*)(bool)>(&value<bool>::valueChanged), + static_cast<void (base_value::*)(bool) const>(&value<bool>::valueChanged), [] (bool flag) -> void { runonce_check.set_enabled(flag); }); runonce_check.try_runonce(); } |