summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-01-10 03:01:59 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-01-10 03:37:40 +0100
commitfefff49d13f765c249a2419309ed16a8b425df66 (patch)
tree5133e2cf3de37b59614ccb1ffea7338d23ffea8a /gui
parent43dcfd6806e171955c21d18433350c4158b27faf (diff)
many: get rid of trailing type specifiers
Diffstat (limited to 'gui')
-rw-r--r--gui/main-window.cpp28
-rw-r--r--gui/mapping-dialog.cpp2
-rw-r--r--gui/settings.cpp4
3 files changed, 17 insertions, 17 deletions
diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index 2aa60a2f..34846131 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -172,19 +172,19 @@ MainWindow::MainWindow() :
}
connect(this, &MainWindow::start_tracker,
- this, [&]() -> void { qDebug() << "start tracker"; start_tracker_(); },
+ this, [&]() { qDebug() << "start tracker"; start_tracker_(); },
Qt::QueuedConnection);
connect(this, &MainWindow::stop_tracker,
- this, [&]() -> void { qDebug() << "stop tracker"; stop_tracker_(); },
+ this, [&]() { qDebug() << "stop tracker"; stop_tracker_(); },
Qt::QueuedConnection);
connect(this, &MainWindow::toggle_tracker,
- this, [&]() -> void { qDebug() << "toggle tracker"; if (work) stop_tracker_(); else start_tracker_(); },
+ this, [&]() { qDebug() << "toggle tracker"; if (work) stop_tracker_(); else start_tracker_(); },
Qt::QueuedConnection);
connect(this, &MainWindow::restart_tracker,
- this, [&]() -> void { qDebug() << "restart tracker"; stop_tracker_(); start_tracker_(); },
+ this, [&]() { qDebug() << "restart tracker"; stop_tracker_(); start_tracker_(); },
Qt::QueuedConnection);
// tray
@@ -270,17 +270,17 @@ void MainWindow::register_shortcuts()
t_keys keys
{
- t_key(s.key_start_tracking1, [&](bool) -> void { start_tracker(); }, true),
- t_key(s.key_start_tracking2, [&](bool) -> void { start_tracker(); }, true),
+ t_key(s.key_start_tracking1, [&](bool) { start_tracker(); }, true),
+ t_key(s.key_start_tracking2, [&](bool) { start_tracker(); }, true),
- t_key(s.key_stop_tracking1, [&](bool) -> void { stop_tracker(); }, true),
- t_key(s.key_stop_tracking2, [&](bool) -> void { stop_tracker(); }, true),
+ t_key(s.key_stop_tracking1, [&](bool) { stop_tracker(); }, true),
+ t_key(s.key_stop_tracking2, [&](bool) { stop_tracker(); }, true),
- t_key(s.key_toggle_tracking1, [&](bool) -> void { toggle_tracker(); }, true),
- t_key(s.key_toggle_tracking2, [&](bool) -> void { toggle_tracker(); }, true),
+ t_key(s.key_toggle_tracking1, [&](bool) { toggle_tracker(); }, true),
+ t_key(s.key_toggle_tracking2, [&](bool) { toggle_tracker(); }, true),
- t_key(s.key_restart_tracking1, [&](bool) -> void { restart_tracker(); }, true),
- t_key(s.key_restart_tracking2, [&](bool) -> void { restart_tracker(); }, true),
+ t_key(s.key_restart_tracking1, [&](bool) { restart_tracker(); }, true),
+ t_key(s.key_restart_tracking2, [&](bool) { restart_tracker(); }, true),
};
global_shortcuts.reload(keys);
@@ -654,7 +654,7 @@ bool MainWindow::mk_dialog(std::shared_ptr<dylib> lib, std::unique_ptr<t>& d)
{
const bool just_created = mk_window_common(d, [&]() -> t* {
if (lib && lib->Dialog)
- return reinterpret_cast<t*>(lib->Dialog());
+ return (t*) lib->Dialog();
return nullptr;
});
@@ -690,7 +690,7 @@ void MainWindow::show_filter_settings()
void MainWindow::show_options_dialog()
{
- if (mk_window(options_widget, [&](bool flag) -> void { set_keys_enabled(!flag); }))
+ if (mk_window(options_widget, [&](bool flag) { set_keys_enabled(!flag); }))
{
connect(options_widget.get(), &OptionsDialog::closing, this, &MainWindow::register_shortcuts);
}
diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp
index 68e61041..fbe274e0 100644
--- a/gui/mapping-dialog.cpp
+++ b/gui/mapping-dialog.cpp
@@ -118,7 +118,7 @@ void MapWidget::load()
connect(&axis.opts.altp,
base_value::value_changed<bool>(),
this,
- [&](bool f) -> void {qfc.setEnabled(f); qfc.force_redraw();});
+ [&](bool f) {qfc.setEnabled(f); qfc.force_redraw();});
qfc.setEnabled(axis.opts.altp);
qfc.force_redraw();
}
diff --git a/gui/settings.cpp b/gui/settings.cpp
index 33d9b5cf..3b14dec7 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -138,9 +138,9 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
connect(&val.opt.keycode,
static_cast<void (base_value::*)(const QString&) const>(&base_value::valueChanged),
val.label,
- [=](const QString&) -> void { val.label->setText(kopts_to_string(val.opt)); });
+ [=](const QString&) { val.label->setText(kopts_to_string(val.opt)); });
{
- connect(val.button, &QPushButton::clicked, this, [=]() -> void { bind_key(val.opt, val.label); });
+ connect(val.button, &QPushButton::clicked, this, [=]() { bind_key(val.opt, val.label); });
}
}
}