Fix a Clang error.

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 9e21294d14bfa19340558d082e65b22663eb2cb7..23840ff8441a0d4dfcadcdd434e3c5a3bf2e617f 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -32,17 +32,6 @@ static PlayList *playlist_clips;
 
 extern int64_t current_pts;
 
-template <class Model>
-void replace_model(QTableView *view, Model **model, Model *new_model, MainWindow *main_window)
-{
-       QItemSelectionModel *old_selection_model = view->selectionModel();
-       view->setModel(new_model);
-       delete *model;
-       delete old_selection_model;
-       *model = new_model;
-       main_window->connect(new_model, &Model::any_content_changed, main_window, &MainWindow::content_changed);
-}
-
 MainWindow::MainWindow()
        : ui(new Ui::MainWindow),
          db(global_flags.working_directory + "/futatabi.db")
@@ -943,8 +932,8 @@ void MainWindow::undo_triggered()
        StateProto state = undo_stack.back();
        ui->undo_action->setEnabled(undo_stack.size() > 1);
 
-       replace_model(ui->clip_list, &cliplist_clips, new ClipList(state.clip_list()), this);
-       replace_model(ui->playlist, &playlist_clips, new PlayList(state.play_list()), this);
+       replace_model(ui->clip_list, &cliplist_clips, new ClipList(state.clip_list()));
+       replace_model(ui->playlist, &playlist_clips, new PlayList(state.play_list()));
 
        db.store_state(state);
 }
@@ -962,8 +951,8 @@ void MainWindow::redo_triggered()
        ui->redo_action->setEnabled(!redo_stack.empty());
 
        const StateProto &state = undo_stack.back();
-       replace_model(ui->clip_list, &cliplist_clips, new ClipList(state.clip_list()), this);
-       replace_model(ui->playlist, &playlist_clips, new PlayList(state.play_list()), this);
+       replace_model(ui->clip_list, &cliplist_clips, new ClipList(state.clip_list()));
+       replace_model(ui->playlist, &playlist_clips, new PlayList(state.play_list()));
 
        db.store_state(state);
 }
@@ -1023,3 +1012,14 @@ pair<string, string> MainWindow::get_queue_status() const {
        lock_guard<mutex> lock(queue_status_mu);
        return {queue_status, "text/plain"};
 }
+
+template <class Model>
+void MainWindow::replace_model(QTableView *view, Model **model, Model *new_model)
+{
+       QItemSelectionModel *old_selection_model = view->selectionModel();
+       view->setModel(new_model);
+       delete *model;
+       delete old_selection_model;
+       *model = new_model;
+       connect(new_model, &Model::any_content_changed, this, &MainWindow::content_changed);
+}

diff --git a/futatabi/mainwindow.h b/futatabi/mainwindow.h
index 9e77d629e7944c5dbbf80aebe4cd756baf66afa9..798745609b9ca7627aac96aff337f6cc0cae9f5e 100644 (file)
--- a/futatabi/mainwindow.h
+++ b/futatabi/mainwindow.h
@@ -20,6 +20,7 @@ class MainWindow;
 }  // namespace Ui
 
 class Player;
+class QTableView;
 
 class MainWindow : public QMainWindow {
        Q_OBJECT
@@ -118,6 +119,9 @@ private:
 
        void highlight_camera_input(int stream_idx);
 
+       template <class Model>
+       void replace_model(QTableView *view, Model **model, Model *new_model);
+
 private slots:
        void relayout();
 };