From 763303c99df6abebff9fe48da63fac2c5d7f2dd5 Mon Sep 17 00:00:00 2001 From: philmoz Date: Tue, 11 Jun 2024 08:26:59 +1000 Subject: [PATCH] chore(cpn): cleanup build warnings (#5145) --- companion/src/generaledit/calibration.cpp | 3 +-- companion/src/mdichild.cpp | 6 +++--- companion/src/updates/repobuild.h | 12 ++++++------ companion/src/updates/repogithub.h | 12 ++++++------ companion/src/updates/updatecloudbuild.cpp | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/companion/src/generaledit/calibration.cpp b/companion/src/generaledit/calibration.cpp index 931ff16d9..8da44c935 100644 --- a/companion/src/generaledit/calibration.cpp +++ b/companion/src/generaledit/calibration.cpp @@ -33,13 +33,12 @@ CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSe TableLayout * tableLayout = new TableLayout(this, maxrows, headerLabels); - for (int i = 0, row = 0; i < maxinputs; i++) { + for (int i = 0; i < maxinputs; i++) { if (!Boards::isInputCalibrated(i)) continue; GeneralSettings::InputCalib &calib = generalSettings.inputConfig[i].calib; int col = 0; - row++; QLabel * label = new QLabel(this); label->setText(Boards::getInputName(i)); tableLayout->addWidget(i, col++, label); diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 44e37d93d..a3b5e692c 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -915,7 +915,7 @@ void MdiChild::pasteModelData(const QMimeData * mimeData, const QModelIndex row, bool modified = false; int modelIdx = modelsListModel->getModelIndex(row); - unsigned inserts = 0; + // unsigned inserts = 0; QVector deletesList; // Force DnD moves from other file windows to be copy actions because we don't want to delete our models. @@ -942,7 +942,7 @@ void MdiChild::pasteModelData(const QMimeData * mimeData, const QModelIndex row, ok = insertModelRows(modelIdx, 1); if (ok) { radioData.models[modelIdx] = modelsList[i]; - ++inserts; + // ++inserts; } } else if (!deletesList.contains(modelIdx)) { @@ -970,7 +970,7 @@ void MdiChild::pasteModelData(const QMimeData * mimeData, const QModelIndex row, ok = insertModelRows(modelIdx, 1); if (ok) { radioData.models[modelIdx] = modelsList[i]; - ++inserts; + // ++inserts; } } else if (msgBox.clickedButton() == cancelButton) { diff --git a/companion/src/updates/repobuild.h b/companion/src/updates/repobuild.h index e1ea34e17..8114e5b11 100644 --- a/companion/src/updates/repobuild.h +++ b/companion/src/updates/repobuild.h @@ -32,12 +32,12 @@ class RepoBuild : public Repo const QString & path, const QString & nightly, const int resultsPerPage); virtual ~RepoBuild(); - const QString urlAsset(const int assetId) const; - const QString urlAssets(const int releaseId) const { return ""; } - const QString urlContent(const QString & filename) const { return ""; } - const QString urlJobs() const; - const QString urlReleases() const; - const QString urlStatus() const; + const QString urlAsset(const int assetId) const override; + const QString urlAssets(const int releaseId) const override { return ""; } + const QString urlContent(const QString & filename) const override { return ""; } + const QString urlJobs() const override; + const QString urlReleases() const override; + const QString urlStatus() const override; const UpdateNetwork::DownloadDataType assetDownloadDataType() const override { return UpdateNetwork::DDT_Build_SaveToFile; } const UpdateNetwork::DownloadDataType assetContentDataType() const override { return UpdateNetwork::DDT_Unknown; } diff --git a/companion/src/updates/repogithub.h b/companion/src/updates/repogithub.h index 4e5bc6c62..9aaa96f56 100644 --- a/companion/src/updates/repogithub.h +++ b/companion/src/updates/repogithub.h @@ -32,12 +32,12 @@ class RepoGitHub : public Repo const QString & path, const QString & nightly, const int resultsPerPage); virtual ~RepoGitHub(); - const QString urlAsset(const int assetId) const; - const QString urlAssets(const int releaseId) const; - const QString urlContent(const QString & filename) const; - const QString urlJobs() const { return ""; } - const QString urlReleases() const; - const QString urlStatus() const { return ""; } + const QString urlAsset(const int assetId) const override; + const QString urlAssets(const int releaseId) const override; + const QString urlContent(const QString & filename) const override; + const QString urlJobs() const override { return ""; } + const QString urlReleases() const override; + const QString urlStatus() const override { return ""; } const UpdateNetwork::DownloadDataType assetDownloadDataType() const override { return UpdateNetwork::DDT_GitHub_SaveToFile; } const UpdateNetwork::DownloadDataType assetContentDataType() const override { return UpdateNetwork::DDT_GitHub_Content; } diff --git a/companion/src/updates/updatecloudbuild.cpp b/companion/src/updates/updatecloudbuild.cpp index 0d35670f4..52989db52 100644 --- a/companion/src/updates/updatecloudbuild.cpp +++ b/companion/src/updates/updatecloudbuild.cpp @@ -29,7 +29,7 @@ constexpr char STATUS_UNKNOWN[] {"STATUS_UNKNOWN"}; constexpr char STATUS_WAITING_FOR_BUILD[] {"WAITING_FOR_BUILD"}; constexpr char STATUS_BUILD_IN_PROGRESS[] {"BUILD_IN_PROGRESS"}; constexpr char STATUS_BUILD_SUCCESS[] {"BUILD_SUCCESS"}; -constexpr char STATUS_BUILD_ERROR[] {"BUILD_ERROR"}; +// constexpr char STATUS_BUILD_ERROR[] {"BUILD_ERROR"}; UpdateCloudBuild::UpdateCloudBuild(QWidget * parent) : UpdateInterface(parent, CID_CloudBuild, tr("CloudBuild"), Repo::REPO_TYPE_BUILD,