VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-09 13:59:45 -04:00
Code Issues Projects Releases Wiki Activity

Fixed -Wreorder warnings

Browse Source
This commit is contained in:
f4exb 2020-11-14 05:51:19 +01:00
parent 6519bfc05f
commit f668863aed
31 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp
View File

@ -25,9 +25,9 @@ ADSBDemodDisplayDialog::ADSBDemodDisplayDialog(
bool displayHeliports, bool siUnits, QString fontName, int fontSize, bool displayDemodStats,
bool autoResizeTableColumns, QWidget* parent) :
QDialog(parent),
ui(new Ui::ADSBDemodDisplayDialog),
m_fontName(fontName),
m_fontSize(fontSize)
m_fontSize(fontSize),
ui(new Ui::ADSBDemodDisplayDialog)
{
ui->setupUi(this);
ui->timeout->setValue(removeTimeout);

4
plugins/channelrx/demodadsb/adsbdemodgui.cpp
View File

@ -1771,10 +1771,10 @@ ADSBDemodGUI::ADSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
m_basicSettingsShown(false),
m_doApplySettings(true),
m_tickCount(0),
m_trackAircraft(nullptr),
m_highlightAircraft(nullptr),
m_aircraftInfo(nullptr),
m_airportModel(this),
m_trackAircraft(nullptr),
m_highlightAircraft(nullptr),
m_progressDialog(nullptr)
{
ui->setupUi(this);

2
plugins/channelrx/demodam/amdemodsink.cpp
View File

@ -28,8 +28,8 @@
AMDemodSink::AMDemodSink() :
m_channelSampleRate(48000),
m_audioSampleRate(48000),
m_channelFrequencyOffset(0),
m_audioSampleRate(48000),
m_squelchCount(0),
m_squelchOpen(false),
m_squelchDelayLine(9600),

4
plugins/channelrx/demodatv/atvdemodsink.cpp
View File

@ -41,13 +41,13 @@ ATVDemodSink::ATVDemodSink() :
m_ampMin(-1.0f),
m_ampMax(1.0f),
m_ampDelta(2.0f),
m_amSampleIndex(0),
m_sampleOffset(0),
m_sampleOffsetFrac(0.0f),
m_sampleOffsetDetected(0),
m_lineIndex(0),
m_hSyncShift(0.0f),
m_hSyncErrorCount(0),
m_amSampleIndex(0),
m_lineIndex(0),
m_ampAverage(4800),
m_bfoPLL(200/1000000, 100/1000000, 0.01),
m_bfoFilter(200.0, 1000000.0, 0.9),

8
plugins/channelrx/demodchirpchat/chirpchatdemodsink.cpp
View File

@ -32,13 +32,13 @@
ChirpChatDemodSink::ChirpChatDemodSink() :
m_decodeMsg(nullptr),
m_decoderMsgQueue(nullptr),
m_spectrumSink(nullptr),
m_spectrumBuffer(nullptr),
m_fftSequence(-1),
m_fftSFDSequence(-1),
m_downChirps(nullptr),
m_upChirps(nullptr),
m_spectrumLine(nullptr),
m_fftSequence(-1),
m_fftSFDSequence(-1)
m_spectrumSink(nullptr),
m_spectrumBuffer(nullptr)
{
m_demodActive = false;
m_bandwidth = ChirpChatDemodSettings::bandwidths[0];

2
plugins/channelrx/demoddsd/dsddemodsink.cpp
View File

@ -40,8 +40,8 @@
DSDDemodSink::DSDDemodSink() :
m_channelSampleRate(48000),
m_audioSampleRate(48000),
m_channelFrequencyOffset(0),
m_audioSampleRate(48000),
m_interpolatorDistance(0.0f),
m_interpolatorDistanceRemain(0.0f),
m_sampleCount(0),

2
plugins/channelrx/demodwfm/wfmdemodsink.cpp
View File

@ -33,8 +33,8 @@ const unsigned int WFMDemodSink::m_rfFilterFftLength = 1024;
WFMDemodSink::WFMDemodSink() :
m_channelSampleRate(384000),
m_audioSampleRate(48000),
m_channelFrequencyOffset(0),
m_audioSampleRate(48000),
m_squelchOpen(false),
m_magsq(0.0f),
m_magsqSum(0.0f),

2
plugins/channelrx/filesink/filesink.cpp
View File

@ -50,9 +50,9 @@ const QString FileSink::m_channelId = "FileSink";
FileSink::FileSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_spectrumVis(SDR_RX_SCALEF),
m_centerFrequency(0),
m_frequencyOffset(0),
m_spectrumVis(SDR_RX_SCALEF),
m_basebandSampleRate(48000)
{
setObjectName(m_channelId);

2
plugins/channelrx/filesink/filesinkbaseband.cpp
View File

@ -30,10 +30,10 @@ MESSAGE_CLASS_DEFINITION(FileSinkBaseband::MsgConfigureFileSinkBaseband, Message
MESSAGE_CLASS_DEFINITION(FileSinkBaseband::MsgConfigureFileSinkWork, Message)
FileSinkBaseband::FileSinkBaseband() :
m_running(false),
m_specMax(0),
m_squelchLevel(0),
m_squelchOpen(false),
m_running(false),
m_mutex(QMutex::Recursive)
{
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000));

6
plugins/channelrx/filesink/filesinksink.cpp
View File

@ -24,11 +24,11 @@
#include "filesinksink.h"
FileSinkSink::FileSinkSink() :
m_spectrumSink(nullptr),
m_msgQueueToGUI(nullptr),
m_nbCaptures(0),
m_preRecordBuffer(48000),
m_preRecordFill(0),
m_spectrumSink(nullptr),
m_msgQueueToGUI(nullptr),
m_recordEnabled(false),
m_record(false),
m_squelchOpen(false),
@ -301,4 +301,4 @@ void FileSinkSink::squelchRecording(bool squelchOpen)
}
m_squelchOpen = squelchOpen;
}
}

18
plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp
View File

@ -25,24 +25,24 @@
IEEE_802_15_4_ModSource::IEEE_802_15_4_ModSource() :
m_channelSampleRate(3000000),
m_spectrumRate(0),
m_channelFrequencyOffset(0),
m_spectrumRate(0),
m_sinLUT(nullptr),
m_scrambler(0x108, 0x1fe, 0),
m_spectrumSink(nullptr),
m_scopeSink(nullptr),
m_magsq(0.0),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_bitCount(0),
m_byteIdx(0),
m_bitIdx(0),
m_state(idle),
m_sampleIdx(0),
m_chipsPerSymbol(15),
m_bitsPerSymbol(1),
m_chipRate(300000),
m_sinLUT(nullptr),
m_spectrumSink(nullptr),
m_scopeSink(nullptr),
m_scrambler(0x108, 0x1fe, 0)
m_state(idle),
m_byteIdx(0),
m_bitIdx(0),
m_bitCount(0)
{
m_lowpass.create(301, m_channelSampleRate, 22000.0 / 2.0);
m_pulseShapeI.create(1, 6, m_channelSampleRate/300000, true);

4
plugins/channeltx/modam/ammodsource.cpp
View File

@ -24,13 +24,13 @@ const int AMModSource::m_levelNbSamples = 480; // every 10ms
AMModSource::AMModSource() :
m_channelSampleRate(48000),
m_channelFrequencyOffset(0),
m_audioSampleRate(48000),
m_audioFifo(4800),
m_feedbackAudioFifo(48000),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_ifstream(nullptr),
m_audioSampleRate(48000)
m_ifstream(nullptr)
{
m_audioBuffer.resize(1<<14);
m_audioBufferFill = 0;

4
plugins/channeltx/modatv/atvmodsource.cpp
View File

@ -115,6 +115,7 @@ ATVModSource::ATVModSource() :
m_tvSampleRate(1000000),
m_horizontalCount(0),
m_lineCount(0),
m_imageLine(0),
m_imageOK(false),
m_videoFPSq(1.0f),
m_videoFPSCount(0.0f),
@ -129,8 +130,7 @@ ATVModSource::ATVModSource() :
m_DSBFilter(nullptr),
m_DSBFilterBuffer(nullptr),
m_DSBFilterBufferIndex(0),
m_messageQueueToGUI(nullptr),
m_imageLine(0)
m_messageQueueToGUI(nullptr)
{
scanCameras();

6
plugins/channeltx/modchirpchat/chirpchatmodsource.cpp
View File

@ -25,12 +25,12 @@ ChirpChatModSource::ChirpChatModSource() :
m_channelSampleRate(48000),
m_channelFrequencyOffset(0),
m_phaseIncrements(nullptr),
m_repeatCount(0),
m_active(false),
m_modPhasor(0.0f),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_repeatCount(0),
m_active(false)
m_levelSum(0.0f)
{
m_magsq = 0.0;

2
plugins/channeltx/modfreedv/freedvmodsource.cpp
View File

@ -29,12 +29,12 @@ FreeDVModSource::FreeDVModSource() :
m_channelSampleRate(48000),
m_channelFrequencyOffset(0),
m_modemSampleRate(48000), // // default 2400A mode
m_audioSampleRate(48000),
m_lowCutoff(0.0),
m_hiCutoff(6000.0),
m_SSBFilter(nullptr),
m_SSBFilterBuffer(0),
m_SSBFilterBufferIndex(0),
m_audioSampleRate(48000),
m_audioFifo(4800),
m_levelCalcCount(0),
m_peakLevel(0.0f),

6
plugins/channeltx/modnfm/nfmmodsource.cpp
View File

@ -26,14 +26,14 @@ NFMModSource::NFMModSource() :
m_channelSampleRate(48000),
m_channelFrequencyOffset(0),
m_modPhasor(0.0f),
m_preemphasisFilter(m_preemphasis*48000),
m_audioSampleRate(48000),
m_audioFifo(4800),
m_feedbackAudioFifo(48000),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_ifstream(nullptr),
m_preemphasisFilter(m_preemphasis*48000),
m_audioSampleRate(48000)
m_ifstream(nullptr)
{
m_audioBuffer.resize(1<<14);
m_audioBufferFill = 0;

14
plugins/channeltx/modpacket/packetmodsource.cpp
View File

@ -25,22 +25,22 @@
PacketModSource::PacketModSource() :
m_channelSampleRate(48000),
m_spectrumRate(0),
m_preemphasisFilter(48000, FMPREEMPHASIS_TAU_US),
m_channelFrequencyOffset(0),
m_magsq(0.0),
m_spectrumRate(0),
m_audioPhase(0.0f),
m_fmPhase(0.0),
m_preemphasisFilter(48000, FMPREEMPHASIS_TAU_US),
m_spectrumSink(nullptr),
m_magsq(0.0),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_bitCount(0),
m_state(idle),
m_byteIdx(0),
m_bitIdx(0),
m_last5Bits(0),
m_state(idle),
m_scrambler(0x10800, 0x0),
m_spectrumSink(nullptr)
m_bitCount(0),
m_scrambler(0x10800, 0x0)
{
m_lowpass.create(301, m_channelSampleRate, 22000.0 / 2.0);
qDebug() << "PacketModSource::PacketModSource creating BPF : " << m_channelSampleRate;

4
plugins/channeltx/modssb/ssbmodsource.cpp
View File

@ -26,13 +26,13 @@ const int SSBModSource::m_levelNbSamples = 480; // every 10ms
SSBModSource::SSBModSource() :
m_channelSampleRate(48000),
m_channelFrequencyOffset(0),
m_audioSampleRate(48000),
m_audioFifo(4800),
m_feedbackAudioFifo(48000),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_ifstream(nullptr),
m_audioSampleRate(48000)
m_ifstream(nullptr)
{
m_SSBFilter = new fftfilt(m_settings.m_lowCutoff / m_audioSampleRate, m_settings.m_bandwidth / m_audioSampleRate, m_ssbFftLen);
m_DSBFilter = new fftfilt((2.0f * m_settings.m_bandwidth) / m_audioSampleRate, 2 * m_ssbFftLen);

8
plugins/channeltx/modwfm/wfmmodsource.cpp
View File

@ -25,14 +25,14 @@ WFMModSource::WFMModSource() :
m_channelSampleRate(384000),
m_channelFrequencyOffset(0),
m_modPhasor(0.0f),
m_audioSampleRate(48000),
m_audioFifo(4800),
m_feedbackAudioSampleRate(48000),
m_feedbackAudioFifo(48000),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f),
m_ifstream(nullptr),
m_audioSampleRate(48000),
m_feedbackAudioSampleRate(48000)
m_ifstream(nullptr)
{
m_rfFilter = new fftfilt(-62500.0 / 384000.0, 62500.0 / 384000.0, m_rfFilterFFTLength);
m_rfFilterBuffer = new Complex[m_rfFilterFFTLength];
@ -400,4 +400,4 @@ void WFMModSource::applyChannelSettings(int channelSampleRate, int channelFreque
m_channelSampleRate = channelSampleRate;
m_channelFrequencyOffset = channelFrequencyOffset;
}
}

4
plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp
View File

@ -63,9 +63,9 @@ LimeSDRMIMOGUI::LimeSDRMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_txDeviceCenterFrequency(435000*1000),
m_lastRxEngineState(DeviceAPI::StNotStarted),
m_lastTxEngineState(DeviceAPI::StNotStarted),
m_sampleRateMode(true),
m_statusCounter(0),
m_deviceStatusCounter(0)
m_deviceStatusCounter(0),
m_sampleRateMode(true)
{
qDebug("LimeSDRMIMOGUI::LimeSDRMIMOGUI");
ui->setupUi(this);

4
plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
View File

@ -60,9 +60,9 @@ XTRXMIMOGUI::XTRXMIMOGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_txDeviceCenterFrequency(435000*1000),
m_lastRxEngineState(DeviceAPI::StNotStarted),
m_lastTxEngineState(DeviceAPI::StNotStarted),
m_sampleRateMode(true),
m_statusCounter(0),
m_deviceStatusCounter(0)
m_deviceStatusCounter(0),
m_sampleRateMode(true)
{
qDebug("XTRXMIMOGUI::XTRXMIMOGUI");
ui->setupUi(this);

4
plugins/samplesink/usrpoutput/usrpoutput.cpp
View File

@ -51,10 +51,10 @@ USRPOutput::USRPOutput(DeviceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_usrpOutputThread(nullptr),
m_bufSamples(0),
m_deviceDescription("USRPOutput"),
m_running(false),
m_channelAcquired(false)
m_channelAcquired(false),
m_bufSamples(0)
{
m_deviceAPI->setNbSinkStreams(1);
m_sampleSourceFifo.resize(SampleSourceFifo::getSizePolicy(m_settings.m_devSampleRate));

4
plugins/samplesource/fcdpro/fcdprothread.cpp
View File

@ -33,9 +33,9 @@ FCDProThread::FCDProThread(SampleSinkFifo* sampleFifo, AudioFifo *fcdFIFO, QObje
m_running(false),
m_log2Decim(0),
m_fcPos(2),
m_iqOrder(true),
m_convertBuffer(fcd_traits<Pro>::convBufSize), // nb samples
m_sampleFifo(sampleFifo),
m_iqOrder(true)
m_sampleFifo(sampleFifo)
{
start();
}

4
plugins/samplesource/fcdproplus/fcdproplusthread.cpp
View File

@ -32,9 +32,9 @@ FCDProPlusThread::FCDProPlusThread(SampleSinkFifo* sampleFifo, AudioFifo *fcdFIF
m_running(false),
m_log2Decim(0),
m_fcPos(2),
m_iqOrder(true),
m_convertBuffer(fcd_traits<ProPlus>::convBufSize), // nb samples
m_sampleFifo(sampleFifo),
m_iqOrder(true)
m_sampleFifo(sampleFifo)
{
start();
}

6
plugins/samplesource/kiwisdr/kiwisdrworker.cpp
View File

@ -18,11 +18,11 @@
#include <boost/endian/conversion.hpp>
#include "kiwisdrworker.h"
KiwiSDRWorker::KiwiSDRWorker(SampleSinkFifo* sampleFifo)
: QObject(),
KiwiSDRWorker::KiwiSDRWorker(SampleSinkFifo* sampleFifo) :
QObject(),
m_timer(this),
m_sampleFifo(sampleFifo),
m_samplesBuf(),
m_sampleFifo(sampleFifo),
m_centerFrequency(1450000),
m_gain(20),
m_useAGC(true),

4
plugins/samplesource/usrpinput/usrpinput.cpp
View File

@ -51,10 +51,10 @@ USRPInput::USRPInput(DeviceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_usrpInputThread(nullptr),
m_bufSamples(0),
m_deviceDescription("USRPInput"),
m_running(false),
m_channelAcquired(false)
m_channelAcquired(false),
m_bufSamples(0)
{
m_streamId = nullptr;
suspendRxBuddies();

4
sdrbase/feature/feature.cpp
View File

@ -27,9 +27,9 @@
MESSAGE_CLASS_DEFINITION(Feature::MsgChannelSettings, Message)
Feature::Feature(const QString& name, WebAPIAdapterInterface *webAPIAdapterInterface) :
m_webAPIAdapterInterface(webAPIAdapterInterface),
m_name(name),
m_uid(UidCalculator::getNewObjectId()),
m_webAPIAdapterInterface(webAPIAdapterInterface)
m_uid(UidCalculator::getNewObjectId())
{
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
}

2
sdrbase/util/crc.h
View File

@ -28,8 +28,8 @@ class SDRBASE_API crc
public:
// Create and initialise CRC with specified polynomial and parameters
crc(int poly_bits, uint32_t polynomial, bool msb_first, uint32_t init_value, uint32_t final_xor) :
m_poly_bits(poly_bits),
m_polynomial(polynomial),
m_poly_bits(poly_bits),
m_msb_first(msb_first),
m_init_value(init_value),
m_final_xor(final_xor)

4
sdrgui/device/deviceuiset.h
View File

@ -109,14 +109,14 @@ private:
int m_channelType;
ChannelInstanceRegistration() :
m_gui(nullptr),
m_channelAPI(nullptr),
m_gui(nullptr),
m_channelType(0)
{ }
ChannelInstanceRegistration(ChannelAPI *channelAPI, ChannelGUI* channelGUI, int channelType) :
m_gui(channelGUI),
m_channelAPI(channelAPI),
m_gui(channelGUI),
m_channelType(channelType)
{ }

2
sdrgui/gui/glspectrum.cpp
View File

@ -58,9 +58,9 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
m_leftMargin(0),
m_rightMargin(0),
m_topMargin(0),
m_frequencyScaleHeight(0),
m_histogramHeight(20),
m_waterfallHeight(0),
m_frequencyScaleHeight(0),
m_bottomMargin(0),
m_waterfallBuffer(nullptr),
m_waterfallBufferPos(0),

2
sdrgui/limerfegui/limerfeusbdialog.cpp
View File

@ -30,9 +30,9 @@
#include "ui_limerfeusbdialog.h"
LimeRFEUSBDialog::LimeRFEUSBDialog(LimeRFEUSBCalib& limeRFEUSBCalib, MainWindow* mainWindow) :
m_limeRFEUSBCalib(limeRFEUSBCalib),
QDialog(mainWindow),
ui(new Ui::LimeRFEUSBDialog),
m_limeRFEUSBCalib(limeRFEUSBCalib),
m_rxTxToggle(false),
m_currentPowerCorrection(0.0),
m_avgPower(false),