From 6c723fa198da84e2ea3819eede1cd9b00d0e5c6c Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 19 Dec 2018 00:34:14 +0100 Subject: [PATCH] Fix some GCC warnings. --- futatabi/clip_list.cpp | 4 ++-- futatabi/clip_list.h | 2 +- futatabi/mainwindow.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/futatabi/clip_list.cpp b/futatabi/clip_list.cpp index b456c75..c586b1a 100644 --- a/futatabi/clip_list.cpp +++ b/futatabi/clip_list.cpp @@ -220,7 +220,7 @@ QVariant ClipList::headerData(int section, Qt::Orientation orientation, int role case Column::DURATION: return "Duration"; default: - if (section >= int(Column::CAMERA_1) && section < int(Column::CAMERA_1) + num_cameras) { + if (is_camera_column(section)) { return QString::fromStdString("Camera " + to_string(section - int(Column::CAMERA_1) + 1)); } else { return ""; @@ -329,7 +329,7 @@ bool PlayList::setData(const QModelIndex &index, const QVariant &value, int role case Column::CAMERA: { bool ok; int camera_idx = value.toInt(&ok); - if (!ok || camera_idx < 1 || camera_idx > num_cameras) { + if (!ok || camera_idx < 1 || camera_idx > int(num_cameras)) { return false; } clips[row].stream_idx = camera_idx - 1; diff --git a/futatabi/clip_list.h b/futatabi/clip_list.h index 0768c76..a42720b 100644 --- a/futatabi/clip_list.h +++ b/futatabi/clip_list.h @@ -84,7 +84,7 @@ public: bool is_camera_column(int column) const { - return (column >= int(Column::CAMERA_1) && column < int(Column::CAMERA_1) + num_cameras); + return (column >= int(Column::CAMERA_1) && column < int(Column::CAMERA_1) + int(num_cameras)); } signals: diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 8982b5f..212c5c4 100644 --- a/futatabi/mainwindow.cpp +++ b/futatabi/mainwindow.cpp @@ -1012,7 +1012,7 @@ void MainWindow::quality_toggled(int quality, bool checked) void MainWindow::highlight_camera_input(int stream_idx) { for (unsigned i = 0; i < num_cameras; ++i) { - if (stream_idx == i) { + if (unsigned(stream_idx) == i) { displays[i].frame->setStyleSheet("background: rgb(0,255,0)"); } else { displays[i].frame->setStyleSheet(""); -- 2.39.2