summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-06-26 22:52:18 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-06-26 23:05:21 +0200
commitee0dd3b6d5ad2b6083372f4e4f0cb57a45aaaff2 (patch)
treedc9374f588200a53a4c2ef556293e176cec97975 /gui
parenta131d0850c731b6b564e493db7148267ceea7e8b (diff)
options/base-value: rename to `value_'
Diffstat (limited to 'gui')
-rw-r--r--gui/mapping-dialog.cpp6
-rw-r--r--gui/settings.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp
index c6e49cee..83a045a0 100644
--- a/gui/mapping-dialog.cpp
+++ b/gui/mapping-dialog.cpp
@@ -120,7 +120,7 @@ void mapping_dialog::load()
if (altp)
{
connect(&axis.opts.altp,
- base_value::value_changed<bool>(),
+ value_::value_changed<bool>(),
this,
[&](bool f) {qfc.setEnabled(f); qfc.force_redraw();});
qfc.setEnabled(axis.opts.altp);
@@ -164,8 +164,8 @@ void mapping_dialog::load()
else
qfc.set_snap(.5, 1);
- connect(&axis.opts.clamp_x_, base_value::value_changed<int>(), &qfc, update_xstep);
- connect(&axis.opts.clamp_y_, base_value::value_changed<int>(), &qfc, update_ystep);
+ connect(&axis.opts.clamp_x_, value_::value_changed<int>(), &qfc, update_xstep);
+ connect(&axis.opts.clamp_y_, value_::value_changed<int>(), &qfc, update_ystep);
// force signal to avoid duplicating the slot's logic
qfc.setConfig(&conf);
diff --git a/gui/settings.cpp b/gui/settings.cpp
index d280a9b7..31bbd87b 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -150,7 +150,7 @@ options_dialog::options_dialog(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&) const>(&base_value::valueChanged),
+ static_cast<void (value_::*)(const QString&) const>(&value_::valueChanged),
val.label,
[=](const QString&) { val.label->setText(kopts_to_string(val.opt)); });
{