Skip to content

Commit

Permalink
chore(cpn): cleanup build warnings (#5145)
Browse files Browse the repository at this point in the history
  • Loading branch information
philmoz authored Jun 10, 2024
1 parent f18d2ff commit 763303c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 18 deletions.
3 changes: 1 addition & 2 deletions companion/src/generaledit/calibration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions companion/src/mdichild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<int> deletesList;

// Force DnD moves from other file windows to be copy actions because we don't want to delete our models.
Expand All @@ -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)) {
Expand Down Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions companion/src/updates/repobuild.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
12 changes: 6 additions & 6 deletions companion/src/updates/repogithub.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion companion/src/updates/updatecloudbuild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 763303c

Please sign in to comment.