]> git.sesse.net Git - nageru/commitdiff
Move some lambdas out into functions.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 17 Jun 2018 21:39:23 +0000 (23:39 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 17 Jun 2018 21:39:23 +0000 (23:39 +0200)
mainwindow.cpp
mainwindow.h

index 0a3b7dc7d3216aeaf327e2d54c7920c44e3d2ad2..579dbb116cf150cc20fab3ee3c426862785033f0 100644 (file)
@@ -38,27 +38,13 @@ MainWindow::MainWindow()
        ui->clip_list->viewport()->installEventFilter(this);
        ui->playlist->viewport()->installEventFilter(this);
 
-       // TODO: These are too big for lambdas.
        QShortcut *cue_in = new QShortcut(QKeySequence(Qt::Key_A), this);
        connect(cue_in, &QShortcut::activated, ui->cue_in_btn, &QPushButton::click);
-       connect(ui->cue_in_btn, &QPushButton::clicked, []{
-               if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
-                       cliplist_clips->back()->pts_in = current_pts;
-                       return;
-               }
-               Clip clip;
-               clip.pts_in = current_pts;
-               cliplist_clips->add_clip(clip);
-       });
+       connect(ui->cue_in_btn, &QPushButton::clicked, this, &MainWindow::cue_in_clicked);
 
        QShortcut *cue_out = new QShortcut(QKeySequence(Qt::Key_S), this);
        connect(cue_out, &QShortcut::activated, ui->cue_out_btn, &QPushButton::click);
-       connect(ui->cue_out_btn, &QPushButton::clicked, []{
-               if (!cliplist_clips->empty()) {
-                       cliplist_clips->back()->pts_out = current_pts;
-                       // TODO: select the row in the clip list?
-               }
-       });
+       connect(ui->cue_out_btn, &QPushButton::clicked, this, &MainWindow::cue_out_clicked);
 
        QShortcut *queue = new QShortcut(QKeySequence(Qt::Key_Q), this);
        connect(queue, &QShortcut::activated, ui->queue_btn, &QPushButton::click);
@@ -81,6 +67,25 @@ MainWindow::MainWindow()
        });
 }
 
+void MainWindow::cue_in_clicked()
+{
+       if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
+               cliplist_clips->back()->pts_in = current_pts;
+               return;
+       }
+       Clip clip;
+       clip.pts_in = current_pts;
+       cliplist_clips->add_clip(clip);
+}
+
+void MainWindow::cue_out_clicked()
+{
+       if (!cliplist_clips->empty()) {
+               cliplist_clips->back()->pts_out = current_pts;
+               // TODO: select the row in the clip list?
+       }
+}
+
 void MainWindow::queue_clicked()
 {
        QItemSelectionModel *selected = ui->clip_list->selectionModel();
index 64bc5d57b5ca6891fa8d5c9657dac17e27cae2b4..6d214ff696b5ddd73e4e576f8f029e94c524fb21 100644 (file)
@@ -36,6 +36,8 @@ private:
        int scrub_row;
        int scrub_column;
 
+       void cue_in_clicked();
+       void cue_out_clicked();
        void queue_clicked();
        void preview_clicked();
        void play_clicked();