From 20371ae8fca3181a91d2787977f193a3bdbbfd95 Mon Sep 17 00:00:00 2001
From: srcejon <jon@beniston.com>
Date: Tue, 2 Apr 2024 17:01:56 +0100
Subject: [PATCH] Fix compiler warnings.

---
 doc/img/{SDI_plugin.jpg => SID_plugin.jpg} | Bin
 plugins/feature/sid/sidgui.cpp             |  23 ++++++++++++++-------
 plugins/feature/sid/sidsettingsdialog.cpp  |   2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)
 rename doc/img/{SDI_plugin.jpg => SID_plugin.jpg} (100%)

diff --git a/doc/img/SDI_plugin.jpg b/doc/img/SID_plugin.jpg
similarity index 100%
rename from doc/img/SDI_plugin.jpg
rename to doc/img/SID_plugin.jpg
diff --git a/plugins/feature/sid/sidgui.cpp b/plugins/feature/sid/sidgui.cpp
index 526eb2cff..2b40f000b 100644
--- a/plugins/feature/sid/sidgui.cpp
+++ b/plugins/feature/sid/sidgui.cpp
@@ -468,12 +468,18 @@ void SIDGUI::applyAllSettings()
 
 void SIDGUI::chartSplitterMoved(int pos, int index)
 {
+    (void) pos;
+    (void) index;
+
     m_settings.m_chartSplitterSizes = ui->chartSplitter->sizes();
     applySetting("chartSplitterSizes");
 }
 
 void SIDGUI::sdoSplitterMoved(int pos, int index)
 {
+    (void) pos;
+    (void) index;
+
     m_settings.m_sdoSplitterSizes = ui->sdoSplitter->sizes();
     applySetting("chartSplitterSizes");
 }
@@ -1153,7 +1159,6 @@ void SIDGUI::showContextMenu(QContextMenuEvent *contextEvent)
 
     if (chartView)
     {
-        qreal closestDistance;
         int closestPoint;
 
         if (m_grbSeries && findClosestPoint(contextEvent, chartView->chart(), m_grbSeries, closestPoint)) {
@@ -1589,7 +1594,8 @@ void SIDGUI::xRayDataUpdated(const QList<GOESXRay::XRayData>& data, bool primary
     {
         if (!start.isValid() || (measurement.m_dateTime > start))
         {
-            ChannelMeasurement* measurements = nullptr;
+            ChannelMeasurement* measurements;
+
             switch (measurement.m_band)
             {
             case GOESXRay::XRayData::SHORT:
@@ -1598,6 +1604,9 @@ void SIDGUI::xRayDataUpdated(const QList<GOESXRay::XRayData>& data, bool primary
             case GOESXRay::XRayData::LONG:
                 measurements = &m_xrayLongMeasurements[idx];
                 break;
+            default:
+                measurements = nullptr;
+                break;
             }
             // Ignore flux measurements of 0, as log10(0) is -Inf
             if (measurements && (measurement.m_flux != 0.0))
@@ -1613,7 +1622,10 @@ void SIDGUI::xRayDataUpdated(const QList<GOESXRay::XRayData>& data, bool primary
 
 void SIDGUI::protonDataUpdated(const QList<GOESXRay::ProtonData>& data, bool primary)
 {
+    (void) primary;
+
     QDateTime start;
+
     if (m_protonMeasurements[0].m_measurements.size() > 0) {
         start = m_protonMeasurements[0].m_measurements.last().m_dateTime;
     }
@@ -1678,12 +1690,7 @@ void SIDGUI::grbDataUpdated(const QList<GRB::Data>& data)
 
 void SIDGUI::sdoImageUpdated(const QImage& image)
 {
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-    const QPixmap *currentPixmap = ui->sdoImage->pixmap();
-    bool setSize = (currentPixmap == nullptr) || currentPixmap->isNull();
-#else
-    bool setSize = ui->sdoImage->pixmap().isNull();
-#endif
+    bool setSize = ui->sdoImage->pixmap(Qt::ReturnByValueConstant()).isNull();
 
     QPixmap pixmap;
     pixmap.convertFromImage(image);
diff --git a/plugins/feature/sid/sidsettingsdialog.cpp b/plugins/feature/sid/sidsettingsdialog.cpp
index 81fc2289f..5dfcf62cb 100644
--- a/plugins/feature/sid/sidsettingsdialog.cpp
+++ b/plugins/feature/sid/sidsettingsdialog.cpp
@@ -135,7 +135,7 @@ void SIDSettingsDialog::getChannels(QStringList& ids, QStringList& titles)
     {
         DeviceSet *deviceSet = deviceSets[deviceSetIndex];
 
-        for (unsigned int channelIndex = 0; channelIndex < deviceSet->getNumberOfChannels(); channelIndex++)
+        for (int channelIndex = 0; channelIndex < deviceSet->getNumberOfChannels(); channelIndex++)
         {
             QString title;
             ChannelWebAPIUtils::getChannelSetting(deviceSetIndex, channelIndex, "title", title);