From b9e24ac7ee70b803e475c31475746c4bd6abe391 Mon Sep 17 00:00:00 2001 From: Eugene Kalenkovich Date: Tue, 3 Nov 2020 10:16:59 -0800 Subject: [PATCH 1/2] Remove deprecated qt foreach QT foreach is on deprecation path (https://codereview.qt-project.org/c/qt/qtbase/+/147363) and already may not be available in qt depending on build configuration. Change to C++11+ range for should be forward-compatible, and as far as I can see C++11 is the current minimum version --- src/ui/movie_grabber_widget.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/movie_grabber_widget.cc b/src/ui/movie_grabber_widget.cc index 7014701cc0..a0c5a98475 100755 --- a/src/ui/movie_grabber_widget.cc +++ b/src/ui/movie_grabber_widget.cc @@ -136,7 +136,7 @@ void MovieGrabberWidget::Add() { void MovieGrabberWidget::Delete() { QModelIndexList selection = table_->selectionModel()->selectedIndexes(); - foreach (QModelIndex index, selection) { table_->removeRow(index.row()); } + for (const auto& index: selection) { table_->removeRow(index.row()); } UpdateViews(); model_viewer_widget_->UpdateMovieGrabber(); } @@ -278,7 +278,7 @@ void MovieGrabberWidget::TimeChanged(QTableWidgetItem* item) { void MovieGrabberWidget::SelectionChanged(const QItemSelection& selected, const QItemSelection& deselected) { - foreach (QModelIndex index, table_->selectionModel()->selectedIndexes()) { + for (const auto& index: table_->selectionModel()->selectedIndexes()) { model_viewer_widget_->SelectMoviewGrabberView(index.row()); } } From adfcb3b007cd47c14e91b7d7de0916fc9a52a73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 12 Nov 2020 10:31:09 +0100 Subject: [PATCH 2/2] Update movie_grabber_widget.cc --- src/ui/movie_grabber_widget.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/movie_grabber_widget.cc b/src/ui/movie_grabber_widget.cc index a0c5a98475..d12b411d55 100755 --- a/src/ui/movie_grabber_widget.cc +++ b/src/ui/movie_grabber_widget.cc @@ -136,7 +136,7 @@ void MovieGrabberWidget::Add() { void MovieGrabberWidget::Delete() { QModelIndexList selection = table_->selectionModel()->selectedIndexes(); - for (const auto& index: selection) { table_->removeRow(index.row()); } + for (const auto& index : selection) { table_->removeRow(index.row()); } UpdateViews(); model_viewer_widget_->UpdateMovieGrabber(); } @@ -278,7 +278,7 @@ void MovieGrabberWidget::TimeChanged(QTableWidgetItem* item) { void MovieGrabberWidget::SelectionChanged(const QItemSelection& selected, const QItemSelection& deselected) { - for (const auto& index: table_->selectionModel()->selectedIndexes()) { + for (const auto& index : table_->selectionModel()->selectedIndexes()) { model_viewer_widget_->SelectMoviewGrabberView(index.row()); } }