From ee0dd3b6d5ad2b6083372f4e4f0cb57a45aaaff2 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 26 Jun 2018 22:52:18 +0200
Subject: options/base-value: rename to `value_'

---
 gui/mapping-dialog.cpp | 6 +++---
 gui/settings.cpp       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'gui')

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)); });
         {
-- 
cgit v1.2.3