Simplify lambda syntax.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c2beb7f183ba7c8dc55d09b66bbf2f7063129713..254e62ddf6ccd66b844ccc186f024d953fd33453 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -219,22 +219,22 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
        // It's not really clear whether PgUp should be forwards or backwards,
        // but mpv does at least up = forwards, so that's probably standard.
        QShortcut *pgdown = new QShortcut(QKeySequence(Qt::Key_PageDown), this);
-       connect(pgdown, &QShortcut::activated, [this]() { ui->video->seek(-120000); });
+       connect(pgdown, &QShortcut::activated, [this] { ui->video->seek(-120000); });
        QShortcut *pgup = new QShortcut(QKeySequence(Qt::Key_PageUp), this);
-       connect(pgup, &QShortcut::activated, [this]() { ui->video->seek(120000); });
+       connect(pgup, &QShortcut::activated, [this] { ui->video->seek(120000); });
 
-       connect(ui->minus10s, &QPushButton::clicked, [this]() { ui->video->seek(-10000); });
-       connect(ui->plus10s, &QPushButton::clicked, [this]() { ui->video->seek(10000); });
+       connect(ui->minus10s, &QPushButton::clicked, [this] { ui->video->seek(-10000); });
+       connect(ui->plus10s, &QPushButton::clicked, [this] { ui->video->seek(10000); });
 
-       connect(ui->minus2s, &QPushButton::clicked, [this]() { ui->video->seek(-2000); });
-       connect(ui->plus2s, &QPushButton::clicked, [this]() { ui->video->seek(2000); });
-       connect(ui->video, &VideoWidget::mouse_back_clicked, [this]() { ui->video->seek(-2000); });
-       connect(ui->video, &VideoWidget::mouse_forward_clicked, [this]() { ui->video->seek(2000); });
+       connect(ui->minus2s, &QPushButton::clicked, [this] { ui->video->seek(-2000); });
+       connect(ui->plus2s, &QPushButton::clicked, [this] { ui->video->seek(2000); });
+       connect(ui->video, &VideoWidget::mouse_back_clicked, [this] { ui->video->seek(-2000); });
+       connect(ui->video, &VideoWidget::mouse_forward_clicked, [this] { ui->video->seek(2000); });
 
-       connect(ui->minus1f, &QPushButton::clicked, [this]() { ui->video->seek_frames(-1); });
-       connect(ui->plus1f, &QPushButton::clicked, [this]() { ui->video->seek_frames(1); });
+       connect(ui->minus1f, &QPushButton::clicked, [this] { ui->video->seek_frames(-1); });
+       connect(ui->plus1f, &QPushButton::clicked, [this] { ui->video->seek_frames(1); });
 
-       connect(ui->play_pause, &QPushButton::clicked, [this]() {
+       connect(ui->play_pause, &QPushButton::clicked, [this] {
                if (playing) {
                        ui->video->pause();
                        ui->play_pause->setText("Play (space)");
@@ -248,18 +248,18 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
                ui->play_pause->setShortcut(QCoreApplication::translate("MainWindow", "Space", nullptr));
        });
 
-       connect(ui->player_1, &QPushButton::clicked, [this]() { insert_player_event(0); });
-       connect(ui->player_2, &QPushButton::clicked, [this]() { insert_player_event(1); });
-       connect(ui->player_3, &QPushButton::clicked, [this]() { insert_player_event(2); });
-       connect(ui->player_4, &QPushButton::clicked, [this]() { insert_player_event(3); });
-       connect(ui->player_5, &QPushButton::clicked, [this]() { insert_player_event(4); });
-       connect(ui->player_6, &QPushButton::clicked, [this]() { insert_player_event(5); });
-       connect(ui->player_7, &QPushButton::clicked, [this]() { insert_player_event(6); });
+       connect(ui->player_1, &QPushButton::clicked, [this] { insert_player_event(0); });
+       connect(ui->player_2, &QPushButton::clicked, [this] { insert_player_event(1); });
+       connect(ui->player_3, &QPushButton::clicked, [this] { insert_player_event(2); });
+       connect(ui->player_4, &QPushButton::clicked, [this] { insert_player_event(3); });
+       connect(ui->player_5, &QPushButton::clicked, [this] { insert_player_event(4); });
+       connect(ui->player_6, &QPushButton::clicked, [this] { insert_player_event(5); });
+       connect(ui->player_7, &QPushButton::clicked, [this] { insert_player_event(6); });
 
        // Offensive events
-       connect(ui->offense_label, &ClickableLabel::clicked, [this]() { insert_noplayer_event("set_offense"); });
-       connect(ui->catch_, &QPushButton::clicked, [this]() { set_current_event_type("catch"); });
-       connect(ui->throwaway, &QPushButton::clicked, [this, events]() {
+       connect(ui->offense_label, &ClickableLabel::clicked, [this] { insert_noplayer_event("set_offense"); });
+       connect(ui->catch_, &QPushButton::clicked, [this] { set_current_event_type("catch"); });
+       connect(ui->throwaway, &QPushButton::clicked, [this, events] {
                EventsModel::Status s = events->get_status_at(ui->video->get_position());
                if (s.attack_state == EventsModel::Status::DEFENSE && s.pull_state == EventsModel::Status::PULL_IN_AIR) {
                        insert_noplayer_event("pull_oob");
@@ -267,10 +267,10 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
                        set_current_event_type("throwaway");
                }
        });
-       connect(ui->drop, &QPushButton::clicked, [this]() { set_current_event_type("drop"); });
-       connect(ui->goal, &QPushButton::clicked, [this]() { set_current_event_type("goal"); });
-       connect(ui->stallout, &QPushButton::clicked, [this]() { set_current_event_type("stallout"); });
-       connect(ui->soft_plus, &QPushButton::clicked, [this, events]() {
+       connect(ui->drop, &QPushButton::clicked, [this] { set_current_event_type("drop"); });
+       connect(ui->goal, &QPushButton::clicked, [this] { set_current_event_type("goal"); });
+       connect(ui->stallout, &QPushButton::clicked, [this] { set_current_event_type("stallout"); });
+       connect(ui->soft_plus, &QPushButton::clicked, [this, events] {
                EventsModel::Status s = events->get_status_at(ui->video->get_position());
                if (s.attack_state == EventsModel::Status::OFFENSE) {
                        set_current_event_type("offensive_soft_plus");
@@ -278,7 +278,7 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
                        set_current_event_type("defensive_soft_plus");
                }
        });
-       connect(ui->soft_minus, &QPushButton::clicked, [this, events]() {
+       connect(ui->soft_minus, &QPushButton::clicked, [this, events] {
                EventsModel::Status s = events->get_status_at(ui->video->get_position());
                if (s.attack_state == EventsModel::Status::OFFENSE) {
                        set_current_event_type("offensive_soft_minus");
@@ -286,7 +286,7 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
                        set_current_event_type("defensive_soft_minus");
                }
        });
-       connect(ui->pull_or_was_d, &QPushButton::clicked, [this, events]() {
+       connect(ui->pull_or_was_d, &QPushButton::clicked, [this, events] {
                EventsModel::Status s = events->get_status_at(ui->video->get_position());
                if (s.pull_state == EventsModel::Status::SHOULD_PULL ||
                    events->get_status_at(ui->video->get_position() - 1).pull_state == EventsModel::Status::SHOULD_PULL) {
@@ -299,24 +299,24 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
        });
 
        // Defensive events.
-       connect(ui->interception, &QPushButton::clicked, [this]() { set_current_event_type("interception"); });
-       connect(ui->defense_label, &ClickableLabel::clicked, [this]() { insert_noplayer_event("set_defense"); });
-       connect(ui->their_throwaway, &QPushButton::clicked, [this]() { insert_noplayer_event("their_throwaway"); });
-       connect(ui->their_goal, &QPushButton::clicked, [this]() { insert_noplayer_event("their_goal"); });
-       connect(ui->their_pull, &QPushButton::clicked, [this, events]() {
+       connect(ui->interception, &QPushButton::clicked, [this] { set_current_event_type("interception"); });
+       connect(ui->defense_label, &ClickableLabel::clicked, [this] { insert_noplayer_event("set_defense"); });
+       connect(ui->their_throwaway, &QPushButton::clicked, [this] { insert_noplayer_event("their_throwaway"); });
+       connect(ui->their_goal, &QPushButton::clicked, [this] { insert_noplayer_event("their_goal"); });
+       connect(ui->their_pull, &QPushButton::clicked, [this, events] {
                EventsModel::Status s = events->get_status_at(ui->video->get_position());
                if (s.pull_state == EventsModel::Status::SHOULD_PULL) {
                        insert_noplayer_event("their_pull");
                }
        });
-       connect(ui->our_defense, &QPushButton::clicked, [this]() { set_current_event_type("defense"); });
+       connect(ui->our_defense, &QPushButton::clicked, [this] { set_current_event_type("defense"); });
 
-       connect(ui->offensive_formation, &QPushButton::clicked, [this]() { insert_or_change_formation(/*offense=*/true); });
-       connect(ui->defensive_formation, &QPushButton::clicked, [this]() { insert_or_change_formation(/*offense=*/false); });
+       connect(ui->offensive_formation, &QPushButton::clicked, [this] { insert_or_change_formation(/*offense=*/true); });
+       connect(ui->defensive_formation, &QPushButton::clicked, [this] { insert_or_change_formation(/*offense=*/false); });
 
        // Misc. events
-       connect(ui->substitution, &QPushButton::clicked, [this]() { make_substitution(); });
-       connect(ui->stoppage, &QPushButton::clicked, [this, events]() {
+       connect(ui->substitution, &QPushButton::clicked, [this] { make_substitution(); });
+       connect(ui->stoppage, &QPushButton::clicked, [this, events] {
                EventsModel::Status s = events->get_status_at(ui->video->get_position());
                if (s.stoppage) {
                        insert_noplayer_event("restart");
@@ -324,11 +324,11 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
                        insert_noplayer_event("stoppage");
                }
        });
-       connect(ui->unknown, &QPushButton::clicked, [this]() { insert_noplayer_event("unknown"); });
+       connect(ui->unknown, &QPushButton::clicked, [this] { insert_noplayer_event("unknown"); });
 
        QShortcut *key_delete = new QShortcut(QKeySequence(Qt::Key_Delete), this);
-       connect(key_delete, &QShortcut::activated, [this]() { ui->delete_->animateClick(); });
-       connect(ui->delete_, &QPushButton::clicked, [this]() { delete_current_event(); });
+       connect(key_delete, &QShortcut::activated, [this] { ui->delete_->animateClick(); });
+       connect(ui->delete_, &QPushButton::clicked, [this] { delete_current_event(); });
 
        // Menus.
        connect(ui->action_exit, &QAction::triggered, [this] { close(); });