VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clang clean compile

This commit is contained in:
f4exb 2018-03-04 01:47:51 +01:00
parent 98fc93a26b
commit 28e9df5fe8
66 changed files with 184 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/plutosdr/deviceplutosdrparams.h
View File

@ -30,7 +30,7 @@ class DEVICES_API DevicePlutoSDRBox;
* There is only one copy that is constructed by the first participant and destroyed by the last.
* A participant knows it is the first or last by checking the lists of buddies (Rx + Tx).
*/
struct DevicePlutoSDRParams
class DevicePlutoSDRParams
{
public:
DevicePlutoSDRParams();

4
plugins/channelrx/demodbfm/CMakeLists.txt
View File

@ -22,7 +22,9 @@ set(bfm_HEADERS
rdstmc.h
)
set_source_files_properties(rdstmc.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set_source_files_properties(rdstmc.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
endif()
set(bfm_FORMS
bfmdemodgui.ui

2
plugins/channelrx/demoddatv/leansdr/generic.h
View File

@ -329,7 +329,7 @@ private:
template<typename Tin, typename Tout>
struct serializer: runnable
{
serializer(scheduler *sch, pipebuf<Tin> &_in, pipebuf<Tout> &_out) :
serializer(scheduler *sch __attribute__((unused)), pipebuf<Tin> &_in, pipebuf<Tout> &_out) :
nin(max((size_t) 1, sizeof(Tin) / sizeof(Tout))), nout(max((size_t) 1, sizeof(Tout) / sizeof(Tin))), in(_in), out(_out, nout)
{
if (nin * sizeof(Tin) != nout * sizeof(Tout))

1
plugins/channelrx/demoddatv/leansdr/sdr.h
View File

@ -325,7 +325,6 @@ private:
float gain = estimated ? out_rms / sqrtf(estimated) : 0;
pin = in.rd();
complex<T> *pout = out.wr();
float bwcomp = 1 - bw;
for (; pin < pend; ++pin, ++pout)
{
pout->re = pin->re * gain;

1
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -50,7 +50,6 @@ DSDDemod::DSDDemod(DeviceSourceAPI *deviceAPI) :
m_squelchGate(0),
m_squelchLevel(1e-4),
m_squelchOpen(false),
m_fmExcursion(24),
m_audioFifo1(48000),
m_audioFifo2(48000),
m_scope(0),

2
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -181,8 +181,6 @@ private:
double m_magsqPeak;
int m_magsqCount;
Real m_fmExcursion;
SampleVector m_scopeSampleBuffer;
AudioVector m_audioBuffer;
uint m_audioBufferFill;

2
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -55,7 +55,6 @@ NFMDemod::NFMDemod(DeviceSourceAPI *devieAPI) :
m_sampleCount(0),
m_squelchCount(0),
m_squelchGate(2),
m_audioMute(false),
m_squelchLevel(-990),
m_squelchOpen(false),
m_afSquelchOpen(false),
@ -64,7 +63,6 @@ NFMDemod::NFMDemod(DeviceSourceAPI *devieAPI) :
m_magsqPeak(0.0f),
m_magsqCount(0),
m_afSquelch(2, afSqTones),
m_fmExcursion(2400),
m_audioFifo(48000),
m_settingsMutex(QMutex::Recursive)
{

8
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -191,7 +191,6 @@ private:
int m_sampleCount;
int m_squelchCount;
int m_squelchGate;
bool m_audioMute;
Real m_squelchLevel;
bool m_squelchOpen;
@ -201,16 +200,9 @@ private:
double m_magsqPeak;
int m_magsqCount;
Real m_lastArgument;
//Complex m_m1Sample;
//Complex m_m2Sample;
MovingAverageUtil<Real, double, 32> m_movingAverage;
AFSquelch m_afSquelch;
Real m_agcLevel; // AGC will aim to this level
Real m_agcFloor; // AGC will not go below this level
Real m_fmExcursion;
//Real m_fmScaling;
AudioVector m_audioBuffer;
uint m_audioBufferFill;

1
plugins/channelrx/demodwfm/wfmdemod.h
View File

@ -149,7 +149,6 @@ private:
double m_magsqPeak;
int m_magsqCount;
Real m_lastArgument;
MovingAverageUtil<Real, double, 16> m_movingAverage;
Real m_fmExcursion;

2
plugins/channelrx/tcpsrc/tcpsrcsettings.h
View File

@ -21,7 +21,7 @@
#include <QString>
#include <stdint.h>
struct Serializable;
class Serializable;
struct TCPSrcSettings
{

2
plugins/channelrx/udpsrc/udpsrcsettings.h
View File

@ -21,7 +21,7 @@
#include <QString>
#include <stdint.h>
struct Serializable;
class Serializable;
struct UDPSrcSettings
{

2
plugins/channeltx/modatv/atvmodsettings.h
View File

@ -21,7 +21,7 @@
#include <QString>
#include <stdint.h>
struct Serializable;
class Serializable;
struct ATVModSettings
{

10
plugins/channeltx/modnfm/nfmmod.cpp
View File

@ -179,10 +179,10 @@ void NFMMod::pullAF(Real& sample)
{
switch (m_settings.m_modAFInput)
{
case NFMModInputTone:
case NFMModSettings::NFMModInputTone:
sample = m_toneNco.next();
break;
case NFMModInputFile:
case NFMModSettings::NFMModInputFile:
// sox f4exb_call.wav --encoding float --endian little f4exb_call.raw
// ffplay -f f32le -ar 48k -ac 1 f4exb_call.raw
if (m_ifstream.is_open())
@ -211,10 +211,10 @@ void NFMMod::pullAF(Real& sample)
sample = 0.0f;
}
break;
case NFMModInputAudio:
case NFMModSettings::NFMModInputAudio:
sample = ((m_audioBuffer[m_audioBufferFill].l + m_audioBuffer[m_audioBufferFill].r) / 65536.0f) * m_settings.m_volumeFactor;
break;
case NFMModInputCWTone:
case NFMModSettings::NFMModInputCWTone:
Real fadeFactor;
if (m_cwKeyer.getSample())
@ -235,7 +235,7 @@ void NFMMod::pullAF(Real& sample)
}
}
break;
case NFMModInputNone:
case NFMModSettings::NFMModInputNone:
default:
sample = 0.0f;
break;

11
plugins/channeltx/modnfm/nfmmod.h
View File

@ -91,15 +91,6 @@ public:
{ }
};
typedef enum
{
NFMModInputNone,
NFMModInputTone,
NFMModInputFile,
NFMModInputAudio,
NFMModInputCWTone
} NFMModInputAF;
class MsgConfigureFileSourceName : public Message
{
MESSAGE_CLASS_DECLARATION
@ -296,7 +287,7 @@ private:
quint32 m_recordLength; //!< record length in seconds computed from file size
int m_sampleRate;
NFMModInputAF m_afInput;
NFMModSettings::NFMModInputAF m_afInput;
quint32 m_levelCalcCount;
Real m_peakLevel;
Real m_levelSum;

2
plugins/channeltx/modnfm/nfmmodgui.h
View File

@ -72,7 +72,7 @@ private:
int m_samplesCount;
std::size_t m_tickCount;
bool m_enableNavTime;
NFMMod::NFMModInputAF m_modAFInput;
NFMModSettings::NFMModInputAF m_modAFInput;
MessageQueue m_inputMessageQueue;
explicit NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent = 0);

2
plugins/channeltx/modssb/ssbmodsettings.h
View File

@ -21,7 +21,7 @@
#include <QString>
#include <stdint.h>
struct Serializable;
class Serializable;
struct SSBModSettings
{

2
plugins/channeltx/udpsink/udpsinkgui.cpp
View File

@ -255,7 +255,7 @@ void UDPSinkGUI::on_deltaFrequency_changed(qint64 value)
void UDPSinkGUI::on_sampleFormat_currentIndexChanged(int index)
{
if ((index == (int) UDPSinkSettings::FormatNFM)) {
if (index == (int) UDPSinkSettings::FormatNFM) {
ui->fmDeviation->setEnabled(true);
} else {
ui->fmDeviation->setEnabled(false);

2
plugins/channeltx/udpsink/udpsinksettings.h
View File

@ -21,7 +21,7 @@
#include <QString>
#include <stdint.h>
struct Serializable;
class Serializable;
struct UDPSinkSettings
{

3
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp
View File

@ -28,7 +28,7 @@
const int SDRdaemonSourceBuffer::m_sampleSize = 2;
const int SDRdaemonSourceBuffer::m_iqSampleSize = 2 * m_sampleSize;
SDRdaemonSourceBuffer::SDRdaemonSourceBuffer(uint32_t throttlems) :
SDRdaemonSourceBuffer::SDRdaemonSourceBuffer() :
m_decoderIndexHead(nbDecoderSlots/2),
m_frameHead(0),
m_curNbBlocks(0),
@ -39,7 +39,6 @@ SDRdaemonSourceBuffer::SDRdaemonSourceBuffer(uint32_t throttlems) :
m_maxNbRecovery(0),
m_framesDecoded(true),
m_readIndex(0),
m_throttlemsNominal(throttlems),
m_readBuffer(0),
m_readSize(0),
m_bufferLenSec(0.0f),

3
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h
View File

@ -83,7 +83,7 @@ public:
};
#pragma pack(pop)
SDRdaemonSourceBuffer(uint32_t throttlems);
SDRdaemonSourceBuffer();
~SDRdaemonSourceBuffer();
// R/W operations
@ -207,7 +207,6 @@ private:
uint32_t m_tvOut_usec; //!< Estimated returned samples timestamp (microseconds)
int m_readNbBytes; //!< Nominal number of bytes per read (50ms)
uint32_t m_throttlemsNominal; //!< Initial throttle in ms
uint8_t* m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer
int m_readSize; //!< Read buffer size

4
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
View File

@ -52,9 +52,7 @@ SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
m_settings(),
m_SDRdaemonUDPHandler(0),
m_deviceDescription(),
m_startingTimeStamp(0),
m_autoFollowRate(false),
m_autoCorrBuffer(false)
m_startingTimeStamp(0)
{
m_sender = nn_socket(AF_SP, NN_PAIR);
assert(m_sender != -1);

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
View File

@ -297,8 +297,6 @@ private:
int m_sender;
QString m_deviceDescription;
std::time_t m_startingTimeStamp;
bool m_autoFollowRate;
bool m_autoCorrBuffer;
FileRecord *m_fileSink; //!< File sink to record device I/Q output
void applySettings(const SDRdaemonSourceSettings& settings, bool force = false);

1
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp
View File

@ -32,7 +32,6 @@ SDRdaemonSourceUDPHandler::SDRdaemonSourceUDPHandler(SampleSinkFifo *sampleFifo,
m_masterTimerConnected(false),
m_running(false),
m_rateDivider(1000/SDRDAEMONSOURCE_THROTTLE_MS),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0),
m_dataAddress(QHostAddress::LocalHost),
m_remoteAddress(QHostAddress::LocalHost),

2
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -16925,7 +16925,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2018-02-20T20:02:08.315+01:00
Generated 2018-03-03T23:35:13.013+01:00
</div>
</div>
</div>

14
sdrbase/util/bitfieldindex.h
View File

@ -45,9 +45,19 @@ struct BitfieldIndex
};
template <unsigned int size>
BitfieldIndex<size> operator+(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b) { BitfieldIndex<size> x; x.v = x.a + x.b; return x; }
BitfieldIndex<size> operator+(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b)
{
BitfieldIndex<size> x;
x.v = a.v + b.v;
return x;
}
template <unsigned int size>
BitfieldIndex<size> operator-(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b) { BitfieldIndex<size> x; x.v = x.a - x.b; return x; }
BitfieldIndex<size> operator-(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b)
{
BitfieldIndex<size> x;
x.v = a.v - b.v;
return x;
}
#endif // _UTIL_BITFIELDINDEX_H_

2
sdrgui/dsp/scopevisng.cpp
View File

@ -51,8 +51,6 @@ ScopeVisNG::ScopeVisNG(GLScopeNG* glScope) :
m_timeBase(1),
m_timeOfsProMill(0),
m_traceStart(true),
m_traceFill(0),
m_zTraceIndex(-1),
m_sampleRate(0),
m_traceDiscreteMemory(m_nbTraceMemories),
m_freeRun(true),

2
sdrgui/dsp/scopevisng.h
View File

@ -1033,8 +1033,6 @@ private:
uint32_t m_timeBase; //!< Trace display time divisor
uint32_t m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size
bool m_traceStart; //!< Trace is at start point
int m_traceFill; //!< Count of samples accumulated into trace
int m_zTraceIndex; //!< Index of the trace used for Z input (luminance or false colors)
SampleVector::const_iterator m_triggerPoint; //!< Trigger start location in the samples vector
int m_sampleRate;
TraceBackDiscreteMemory m_traceDiscreteMemory; //!< Complex trace memory for triggered states TODO: vectorize when more than on input is allowed

2
swagger/sdrangel/code/html2/index.html
View File

@ -16925,7 +16925,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2018-02-20T20:02:08.315+01:00
Generated 2018-03-03T23:35:13.013+01:00
</div>
</div>
</div>

8
swagger/sdrangel/code/qt5/client/SWGAudioDevice.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGAudioDevice* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAudioDevice* fromJson(QString &jsonString) override;
QString* getName();
void setName(QString* name);

8
swagger/sdrangel/code/qt5/client/SWGAudioDevices.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGAudioDevices* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAudioDevices* fromJson(QString &jsonString) override;
float getInputVolume();
void setInputVolume(float input_volume);

8
swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGAudioDevicesSelect* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGAudioDevicesSelect* fromJson(QString &jsonString) override;
float getInputVolume();
void setInputVolume(float input_volume);

8
swagger/sdrangel/code/qt5/client/SWGCWKeyerSettings.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGCWKeyerSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGCWKeyerSettings* fromJson(QString &jsonString) override;
qint32 getSampleRate();
void setSampleRate(qint32 sample_rate);

8
swagger/sdrangel/code/qt5/client/SWGChannel.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGChannel* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGChannel* fromJson(QString &jsonString) override;
qint32 getIndex();
void setIndex(qint32 index);

8
swagger/sdrangel/code/qt5/client/SWGChannelListItem.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGChannelListItem* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGChannelListItem* fromJson(QString &jsonString) override;
QString* getName();
void setName(QString* name);

8
swagger/sdrangel/code/qt5/client/SWGChannelSettings.h
View File

@ -38,10 +38,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGChannelSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGChannelSettings* fromJson(QString &jsonString) override;
QString* getChannelType();
void setChannelType(QString* channel_type);

8
swagger/sdrangel/code/qt5/client/SWGDVSeralDevices.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDVSeralDevices* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDVSeralDevices* fromJson(QString &jsonString) override;
qint32 getNbDevices();
void setNbDevices(qint32 nb_devices);

8
swagger/sdrangel/code/qt5/client/SWGDVSerialDevice.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDVSerialDevice* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDVSerialDevice* fromJson(QString &jsonString) override;
QString* getDeviceName();
void setDeviceName(QString* device_name);

8
swagger/sdrangel/code/qt5/client/SWGDeviceListItem.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDeviceListItem* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDeviceListItem* fromJson(QString &jsonString) override;
QString* getDisplayedName();
void setDisplayedName(QString* displayed_name);

8
swagger/sdrangel/code/qt5/client/SWGDeviceSet.h
View File

@ -38,10 +38,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDeviceSet* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDeviceSet* fromJson(QString &jsonString) override;
SWGSamplingDevice* getSamplingDevice();
void setSamplingDevice(SWGSamplingDevice* sampling_device);

8
swagger/sdrangel/code/qt5/client/SWGDeviceSetList.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDeviceSetList* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDeviceSetList* fromJson(QString &jsonString) override;
qint32 getDevicesetcount();
void setDevicesetcount(qint32 devicesetcount);

8
swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h
View File

@ -42,10 +42,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDeviceSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDeviceSettings* fromJson(QString &jsonString) override;
QString* getDeviceHwType();
void setDeviceHwType(QString* device_hw_type);

8
swagger/sdrangel/code/qt5/client/SWGDeviceState.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGDeviceState* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGDeviceState* fromJson(QString &jsonString) override;
QString* getState();
void setState(QString* state);

8
swagger/sdrangel/code/qt5/client/SWGErrorResponse.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGErrorResponse* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGErrorResponse* fromJson(QString &jsonString) override;
QString* getMessage();
void setMessage(QString* message);

8
swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGFileSourceSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGFileSourceSettings* fromJson(QString &jsonString) override;
QString* getFileName();
void setFileName(QString* file_name);

8
swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGHackRFInputSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGHackRFInputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGHackRFOutputSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGHackRFOutputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency);

2
swagger/sdrangel/code/qt5/client/SWGHelpers.cpp
View File

@ -447,7 +447,7 @@ toJsonArray(QList<void*>* value, QJsonObject* output, QString innerName, QString
if(innerType.startsWith("SWG")){
for(void* obj : *value) {
SWGObject *SWGobject = reinterpret_cast<SWGObject *>(obj);
if(SWGobject != nullptr)
if(SWGobject != nullptr)
{
QJsonObject* o = SWGobject->asJsonObject();
outputarray.append(*o);

8
swagger/sdrangel/code/qt5/client/SWGInstanceChannelsResponse.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGInstanceChannelsResponse* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGInstanceChannelsResponse* fromJson(QString &jsonString) override;
qint32 getChannelcount();
void setChannelcount(qint32 channelcount);

8
swagger/sdrangel/code/qt5/client/SWGInstanceDevicesResponse.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGInstanceDevicesResponse* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGInstanceDevicesResponse* fromJson(QString &jsonString) override;
qint32 getDevicecount();
void setDevicecount(qint32 devicecount);

8
swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h
View File

@ -38,10 +38,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGInstanceSummaryResponse* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGInstanceSummaryResponse* fromJson(QString &jsonString) override;
QString* getVersion();
void setVersion(QString* version);

8
swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGLimeSdrInputSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLimeSdrInputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGLimeSdrOutputSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLimeSdrOutputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGLocationInformation.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGLocationInformation* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLocationInformation* fromJson(QString &jsonString) override;
float getLatitude();
void setLatitude(float latitude);

8
swagger/sdrangel/code/qt5/client/SWGLoggingInfo.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGLoggingInfo* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLoggingInfo* fromJson(QString &jsonString) override;
QString* getConsoleLevel();
void setConsoleLevel(QString* console_level);

8
swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGNFMDemodSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGNFMDemodSettings* fromJson(QString &jsonString) override;
qint64 getInputFrequencyOffset();
void setInputFrequencyOffset(qint64 input_frequency_offset);

8
swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGNFMModSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGNFMModSettings* fromJson(QString &jsonString) override;
qint64 getInputFrequencyOffset();
void setInputFrequencyOffset(qint64 input_frequency_offset);

8
swagger/sdrangel/code/qt5/client/SWGPresetExport.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresetExport* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresetExport* fromJson(QString &jsonString) override;
QString* getFilePath();
void setFilePath(QString* file_path);

8
swagger/sdrangel/code/qt5/client/SWGPresetGroup.h
View File

@ -38,10 +38,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresetGroup* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresetGroup* fromJson(QString &jsonString) override;
QString* getGroupName();
void setGroupName(QString* group_name);

8
swagger/sdrangel/code/qt5/client/SWGPresetIdentifier.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresetIdentifier* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresetIdentifier* fromJson(QString &jsonString) override;
QString* getGroupName();
void setGroupName(QString* group_name);

8
swagger/sdrangel/code/qt5/client/SWGPresetImport.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresetImport* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresetImport* fromJson(QString &jsonString) override;
QString* getGroupName();
void setGroupName(QString* group_name);

8
swagger/sdrangel/code/qt5/client/SWGPresetItem.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresetItem* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresetItem* fromJson(QString &jsonString) override;
qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGPresetTransfer.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresetTransfer* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresetTransfer* fromJson(QString &jsonString) override;
qint32 getDeviceSetIndex();
void setDeviceSetIndex(qint32 device_set_index);

8
swagger/sdrangel/code/qt5/client/SWGPresets.h
View File

@ -37,10 +37,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGPresets* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGPresets* fromJson(QString &jsonString) override;
qint32 getNbGroups();
void setNbGroups(qint32 nb_groups);

8
swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h
View File

@ -35,10 +35,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGRtlSdrSettings* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGRtlSdrSettings* fromJson(QString &jsonString) override;
qint32 getDevSampleRate();
void setDevSampleRate(qint32 dev_sample_rate);

8
swagger/sdrangel/code/qt5/client/SWGSamplingDevice.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGSamplingDevice* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGSamplingDevice* fromJson(QString &jsonString) override;
qint32 getIndex();
void setIndex(qint32 index);

8
swagger/sdrangel/code/qt5/client/SWGSuccessResponse.h
View File

@ -36,10 +36,10 @@ public:
void init();
void cleanup();
QString asJson ();
QJsonObject* asJsonObject();
void fromJsonObject(QJsonObject &json);
SWGSuccessResponse* fromJson(QString &jsonString);
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGSuccessResponse* fromJson(QString &jsonString) override;
QString* getMessage();
void setMessage(QString* message);