From 1df46b0ac79b9a9fe185d0b12ea84bb6f8c22b89 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 2 Aug 2020 19:52:17 +0200
Subject: [PATCH] Fixed some compiler warnings

---
 plugins/channeltx/modatv/atvmodsource.h | 2 ++
 sdrgui/gui/glscope.h                    | 3 ---
 sdrgui/gui/glspectrum.cpp               | 2 ++
 sdrgui/gui/glspectrum.h                 | 6 ------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/plugins/channeltx/modatv/atvmodsource.h b/plugins/channeltx/modatv/atvmodsource.h
index 103ba86b2..2f1e9644d 100644
--- a/plugins/channeltx/modatv/atvmodsource.h
+++ b/plugins/channeltx/modatv/atvmodsource.h
@@ -408,6 +408,8 @@ private:
                 return LineBlack;
             }
         }
+
+        return LineBlack;
     }
 
     inline void pullImageLastHalfSample(Real& sample)
diff --git a/sdrgui/gui/glscope.h b/sdrgui/gui/glscope.h
index 7cf7d556b..928d3047a 100644
--- a/sdrgui/gui/glscope.h
+++ b/sdrgui/gui/glscope.h
@@ -131,9 +131,6 @@ private:
             m_timeDeltaStr(other.m_timeDeltaStr),
             m_valueDeltaStr(other.m_valueDeltaStr)
         {}
-        explicit operator ScopeMarker() const {
-            return ScopeMarker{static_cast<ScopeMarker>(*this)};
-        }
     };
     QList<ScopeMarker> m_markers1;
     QList<ScopeMarker> m_markers2;
diff --git a/sdrgui/gui/glspectrum.cpp b/sdrgui/gui/glspectrum.cpp
index f40a99f39..31c855d02 100644
--- a/sdrgui/gui/glspectrum.cpp
+++ b/sdrgui/gui/glspectrum.cpp
@@ -2305,6 +2305,8 @@ QString GLSpectrum::displayScaled(int64_t value, char type, int precision, bool
         return tr("%1%2").arg(QString::number(value / 1000000.0, type, precision)).arg(showMult ? "M" : "");
     } else if (posValue < 1000000000000) {
         return tr("%1%2").arg(QString::number(value / 1000000000.0, type, precision)).arg(showMult ? "G" : "");
+    } else {
+        return tr("%1").arg(QString::number(value, 'e', precision));
     }
 }
 
diff --git a/sdrgui/gui/glspectrum.h b/sdrgui/gui/glspectrum.h
index 1934673ef..64323a3e1 100644
--- a/sdrgui/gui/glspectrum.h
+++ b/sdrgui/gui/glspectrum.h
@@ -169,9 +169,6 @@ private:
             m_deltaFrequencyStr(other.m_deltaFrequencyStr),
             m_deltaPowerStr(other.m_deltaPowerStr)
         {}
-        explicit operator HistogramMarker() const {
-            return HistogramMarker{static_cast<HistogramMarker>(*this)};
-        }
     };
     QList<HistogramMarker> m_histogramMarkers;
 
@@ -218,9 +215,6 @@ private:
             m_deltaFrequencyStr(other.m_deltaFrequencyStr),
             m_deltaTimeStr(other.m_deltaTimeStr)
         {}
-        explicit operator WaterfallMarker() const {
-            return WaterfallMarker{static_cast<WaterfallMarker>(*this)};
-        }
     };
     QList<WaterfallMarker> m_waterfallMarkers;