summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-06 18:34:03 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-10 10:31:58 +0200
commit61884594ceff59279abe5530c8c1af1870dc8fbb (patch)
treec896d862a5dee2ea1647ab9f68961381339fc669 /gui
parent4ad996e116e78dd5f03c1ec47df2d380f6e23a68 (diff)
Revert "options/value: add `QObject::connect` wrapper"
This reverts commit a67e8630caf20e7f48151024e9e68dd9271d75c7.
Diffstat (limited to 'gui')
-rw-r--r--gui/mapping-dialog.cpp8
-rw-r--r--gui/options-dialog.cpp9
2 files changed, 12 insertions, 5 deletions
diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp
index bdf33a77..cdbf532e 100644
--- a/gui/mapping-dialog.cpp
+++ b/gui/mapping-dialog.cpp
@@ -117,7 +117,9 @@ void mapping_dialog::load()
if (altp)
{
- axis.opts.altp.connect_to(this, [&](bool f) { qfc.setEnabled(f); });
+ connect(&axis.opts.altp,
+ value_::value_changed<bool>(),
+ this, [&](bool f) { qfc.setEnabled(f); });
qfc.setEnabled(axis.opts.altp);
}
@@ -162,8 +164,8 @@ void mapping_dialog::load()
qfc.set_snap(.5, 1);
- axis.opts.clamp_x_.connect_to(&qfc, update_xstep);
- axis.opts.clamp_y_.connect_to(&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.set_config(&conf);
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index ab36d73b..ac4117bc 100644
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -167,8 +167,13 @@ options_dialog::options_dialog(std::unique_ptr<ITrackerDialog>& tracker_dialog_,
{
tmp val = val_;
val.label->setText(kopts_to_string(val.opt));
- val.opt.keycode.connect_to(val.label, [=] { val.label->setText(kopts_to_string(val.opt)); }, Qt::DirectConnection);
- connect(val.button, &QPushButton::clicked, this, [=] { bind_key(val.opt, val.label); });
+ connect(&val.opt.keycode,
+ static_cast<void (value_::*)(const QString&) const>(&value_::valueChanged),
+ val.label,
+ [=](const QString&) { val.label->setText(kopts_to_string(val.opt)); });
+ {
+ connect(val.button, &QPushButton::clicked, this, [=] { bind_key(val.opt, val.label); });
+ }
}
auto add_module_tab = [this] (auto& place, auto&& dlg, const QString& label) {