From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 17 Jun 2018 21:39:23 +0000 (+0200)
Subject: Move some lambdas out into functions.
X-Git-Tag: 1.8.0~76^2~262
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b1a48bdf7a96b8541279788a4f67448615d08c8b;p=nageru

Move some lambdas out into functions.
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0a3b7dc..579dbb1 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -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();
diff --git a/mainwindow.h b/mainwindow.h
index 64bc5d5..6d214ff 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -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();