Fix warnings and android issues #2245

DreamNik · 2024-09-05T10:40:43Z

Follow up and fix for #2243

Android libraries can't be placed inside subdirectory, so to distinguish plugins from regular libraries the new prefix is used.

f4exb · 2024-09-07T03:01:50Z

plugins/channelrx/channelpower/channelpowersink.cpp

@@ -21,12 +21,13 @@
 #include "channelpowersink.h"

 ChannelPowerSink::ChannelPowerSink(ChannelPower *channelPower) :
-        m_channelPower(channelPower),


I think it should be removed from the constructor parameters

f4exb · 2024-09-07T03:06:21Z

plugins/channelrx/demodadsb/adsbdemodgui.h

@@ -811,6 +811,10 @@ class ModelMatch {
    {
        m_aircraftRegExp.optimize();
    }
+
+    virtual ~ModelMatch()


or "virtual ~ModelMatch = default" or better "~ModelMatch final = default"

Right, default semantics is better :)
I'll keep virtual destructor, because class isn't final, so finalizing it's destruction less consistent.

Btw, there are lot of warnings like "warning: class with destructor marked 'final' cannot be inherited from [-Wfinal-dtor-non-final-class]". So marking destructor final causes more warnings.

f4exb · 2024-09-07T03:07:58Z

plugins/channelrx/demodapt/aptdemodsink.cpp

@@ -24,7 +24,6 @@
 #include "aptdemodsink.h"

 APTDemodSink::APTDemodSink(APTDemod *packetDemod) :
-        m_aptDemod(packetDemod),


Same remark as with channelpowersink.cpp

f4exb · 2024-09-07T03:09:18Z

plugins/channelrx/demoddab/dabdemodsink.cpp

@@ -488,7 +488,6 @@ void DABDemodSink::processOneAudioSample(Complex &ci)
 }

 DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
-        m_dabDemod(packetDemod),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:11:47Z

plugins/channelrx/demodils/ilsdemodsink.cpp

@@ -31,7 +31,6 @@
 ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:12:11Z

plugins/channelrx/demodnavtex/navtexdemodsink.cpp

@@ -28,7 +28,6 @@
 #include "navtexdemodsink.h"

 NavtexDemodSink::NavtexDemodSink(NavtexDemod *packetDemod) :
-        m_navtexDemod(packetDemod),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:12:41Z

plugins/channelrx/demodpager/pagerdemodsink.cpp

@@ -30,7 +30,6 @@

 PagerDemodSink::PagerDemodSink(PagerDemod *pagerDemod) :
        m_scopeSink(nullptr),
-        m_pagerDemod(pagerDemod),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:12:57Z

plugins/channelrx/demodrtty/rttydemodsink.cpp

@@ -29,7 +29,6 @@
 #include "rttydemodsink.h"

 RttyDemodSink::RttyDemodSink(RttyDemod *packetDemod) :
-        m_rttyDemod(packetDemod),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:13:34Z

plugins/channelrx/freqscanner/freqscannersink.cpp

@@ -27,7 +27,6 @@
 #include "freqscannersink.h"

 FreqScannerSink::FreqScannerSink(FreqScanner *ilsDemod) :
-        m_freqScanner(ilsDemod),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:13:50Z

plugins/channelrx/heatmap/heatmapsink.cpp

@@ -26,7 +26,6 @@

 HeatMapSink::HeatMapSink(HeatMap *heatMap) :
        m_scopeSink(nullptr),
-        m_heatMap(heatMap),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:16:14Z

plugins/channelrx/localsink/localsinksettings.h

@@ -42,7 +42,7 @@ struct LocalSinkSettings
    uint32_t m_log2FFT;
    FFTWindow::Function m_fftWindow;
    bool m_reverseFilter;
-    static const uint32_t m_maxFFTBands = 20;
+    uint32_t m_maxFFTBands;


why not keep it as static const ?

As is it throws error that m_maxFFTBands couldn't be resolved.
Because "static const" member isn't definition but rather a declaration.

f4exb · 2024-09-07T03:16:35Z

plugins/channelrx/localsink/localsinksettings.cpp

@@ -53,6 +53,7 @@ void LocalSinkSettings::resetToDefaults()
    m_reverseAPIChannelIndex = 0;
    m_workspaceIndex = 0;
    m_hidden = false;
+    m_maxFFTBands = 32;


Why 32 and not leave it at 20?

Sorry, leftovers from experiments :) I'll undo the change.

f4exb · 2024-09-07T03:16:58Z

plugins/channelrx/noisefigure/noisefiguresink.cpp

@@ -26,7 +26,6 @@
 #include "noisefiguresink.h"

 NoiseFigureSink::NoiseFigureSink(NoiseFigure *noiseFigure) :
-        m_noiseFigure(noiseFigure),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:17:14Z

plugins/channelrx/radioclock/radioclocksink.cpp

@@ -28,7 +28,6 @@

 RadioClockSink::RadioClockSink(RadioClock *radioClock) :
        m_scopeSink(nullptr),
-        m_radioClock(radioClock),


Remove from constructor parameters if not needed

f4exb · 2024-09-07T03:19:24Z

plugins/channeltx/filesource/filesource.cpp

@@ -54,8 +54,7 @@ FileSource::FileSource(DeviceAPI *deviceAPI) :
    ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),
    m_deviceAPI(deviceAPI),
 	m_frequencyOffset(0),
-	m_basebandSampleRate(0),


Why removing it from the initialization list ?

"m_linearGain" is never used.
And the line with 'm_basebandSampleRate' only got comma removed.

f4exb · 2024-09-07T03:21:55Z

plugins/channeltx/moddatv/dvb-s2/DVB2.cpp

@@ -273,8 +273,6 @@ int DVB2::next_ts_frame_base( u8 *ts )
 }
 DVB2::DVB2(void)
 {
-    // Clear the transport queue
-    m_tp_q.empty();


m_tp_q appears to be unused so it can be removed from the class.

It's used in "unpack_transport_packet_add_crc" as a temporary storage. But I think it's kept inside class to (maybe?) reuse some internal structures.

f4exb · 2024-09-07T03:24:28Z

plugins/samplemimo/metismiso/metismisoudphandler.cpp

-            sampleMic  = (int)((signed char) buffer[b++]) << 8;
-            sampleMic += (int)((unsigned char)buffer[b++]);
+            // sampleMic
+            b+=2;


f4exb · 2024-09-07T03:33:40Z

qrtplib/rtprandom.cpp

@@ -66,7 +66,7 @@ uint32_t RTPRandom::PickSeed()
 #else
    x += (uint32_t)clock();
 #endif
-    x ^= (uint32_t)((uint8_t *)this - (uint8_t *)0);
+    x ^= (uint32_t)(size_t)this;


This is substantially different from the original. Did you test it?

"rtprandom.cpp:69:37: Performing pointer subtraction with a null pointer may have undefined behavior"

Well, for C this is definitely UB. For C++ this should be valid conversion. To make compiler happy i've changed it.
Since this is just a random number generator and converting pointer to integer is valid operation, should be ok.

f4exb · 2024-09-07T03:38:55Z

sdrgui/gui/glshaderspectrogram.cpp

@@ -18,7 +18,13 @@

 #include <QOpenGLShaderProgram>
 #include <QOpenGLFunctions>
-#include <QOpenGLFunctions_3_3_Core>


Why is it not in the #else next? Did you test it?

I'll fix that. Don't know why, maybe copy-paste from glshadertvarray.h.
Shouldn't be an issue since none of the QOpenGLFunctions_*_Core headers are used. Probably safe to remove this include completely. But I can't test for all platforms, so I'll keep the include.

f4exb · 2024-09-07T03:39:55Z

sdrgui/mainwindow.cpp

@@ -3065,7 +3065,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
    }
 }

-void MainWindow::orientationChanged(Qt::ScreenOrientation orientation) const
+void MainWindow::orientationChanged(Qt::ScreenOrientation orientation)


Any valid reason to remove const ?

Yes, "setTabPosition" ,ethod is non-const, so calling it from const method isn't correct.

f4exb · 2024-09-07T03:40:06Z

sdrgui/mainwindow.h

@@ -229,7 +229,7 @@ private slots:
    void openDeviceSetPresetsDialog(QPoint p, const DeviceGUI *deviceGUI);
 	void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release) const;
 	void fftWisdomProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
-    void orientationChanged(Qt::ScreenOrientation orientation) const;
+    void orientationChanged(Qt::ScreenOrientation orientation);


Any valid reason to remove const ?

Yes, "setTabPosition" ,ethod is non-const, so calling it from const method isn't correct.

This is a code smell pointed out by Sonarlint so I am surprised this is not actually const. We'll sort this out later...

sonarqubecloud · 2024-09-09T16:55:22Z

Quality Gate passed

Issues
21 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
2.6% Duplication on New Code

See analysis details on SonarCloud

DreamNik added 5 commits September 3, 2024 23:44

Fix SopaySDR library search when system cmake package present

027d6af

Fix compilation warnings and errors

f694ba0

Append prefix to plugin name when running on Android.

202fc96

Android libraries can't be placed inside subdirectory, so to distinguish plugins from regular libraries the new prefix is used.

Fix compilation with newer ffmpeg libavutil

5103b27

Fix compilation for Android with Qt6

60e1d1c

f4exb reviewed Sep 7, 2024

View reviewed changes

Fix PR comments

d2e89b7

f4exb merged commit d6773ea into f4exb:master Sep 12, 2024
4 checks passed

ghpzin mentioned this pull request Oct 18, 2024

Build failure: sdrangel NixOS/nixpkgs#349450

Closed

		@@ -31,7 +31,6 @@
		ILSDemodSink::ILSDemodSink(ILSDemod *ilsDemod) :

Fix warnings and android issues #2245

Fix warnings and android issues #2245

Conversation

DreamNik commented Sep 5, 2024

f4exb Sep 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DreamNik Sep 9, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 9, 2024

Quality Gate passed

f4exb Sep 7, 2024 •

edited

Loading

DreamNik Sep 9, 2024 •

edited

Loading