From ee0dd3b6d5ad2b6083372f4e4f0cb57a45aaaff2 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 26 Jun 2018 22:52:18 +0200 Subject: options/base-value: rename to `value_' --- options/tie.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'options/tie.hpp') diff --git a/options/tie.hpp b/options/tie.hpp index ff82142e..59fd0da1 100644 --- a/options/tie.hpp +++ b/options/tie.hpp @@ -37,7 +37,7 @@ std::enable_if_t> tie_setting(value& v, QComboBox* cb) cb->setCurrentIndex(cb->findData(int(static_cast(v)))); v = static_cast(cb->currentData().toInt()); - base_value::connect(cb, + value_::connect(cb, static_cast(&QComboBox::currentIndexChanged), &v, [&v, cb](int idx) { run_in_thread_sync(cb, [&] { @@ -46,7 +46,7 @@ std::enable_if_t> tie_setting(value& v, QComboBox* cb) }, v.DIRECT_CONNTYPE); - base_value::connect(&v, base_value::value_changed(), + value_::connect(&v, value_::value_changed(), cb, [cb](int x) { run_in_thread_sync(cb, [=] { cb->setCurrentIndex(cb->findData(x)); }); }, @@ -59,13 +59,13 @@ void tie_setting(value& v, QComboBox* cb, From&& fn_to_index, To&& fn_to_valu cb->setCurrentIndex(fn_to_index(v)); v = fn_to_value(cb->currentIndex(), cb->currentData()); - base_value::connect(cb, static_cast(&QComboBox::currentIndexChanged), + value_::connect(cb, static_cast(&QComboBox::currentIndexChanged), &v, [&v, cb, fn_to_value](int idx) { run_in_thread_sync(cb, [&] { v = fn_to_value(idx, cb->currentData()); }); }, v.DIRECT_CONNTYPE); - base_value::connect(&v, base_value::value_changed(), + value_::connect(&v, value_::value_changed(), cb, [&v, cb, fn_to_index](cv_qualified& v) { run_in_thread_sync(cb, [&] { cb->setCurrentIndex(fn_to_index(v)); @@ -79,7 +79,7 @@ void tie_setting(value& v, QLabel* lb, F&& fun) auto closure = [=](cv_qualified x) { lb->setText(fun(x)); }; closure(v()); - base_value::connect(&v, base_value::value_changed(), + value_::connect(&v, value_::value_changed(), lb, closure, v.SAFE_CONNTYPE); } @@ -92,7 +92,7 @@ void tie_setting(value& v, QObject* obj, F&& fun) fun(v()); - base_value::connect(&v, base_value::value_changed(), + value_::connect(&v, value_::value_changed(), obj, fun, v.DIRECT_CONNTYPE); } -- cgit v1.2.3