From 2e04d2fe9d815999e207b362223e0c23dc30985a Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Fri, 24 May 2019 09:37:13 +0200 Subject: [PATCH] fix windows code to build with MSVC - remove __attribute__((unused)) not supported on MSVC - remove __attribute((unused)) not supported on MSVC - add symbol exports to RemoteDataReadQueue and RemoteDataQueue - add export symbols to sdrsrv --- appsrv/main.cpp | 1 - exports/export.h | 12 ++++++ libfreedv/cohpsk.cpp | 4 +- plugins/channelrx/demodam/amdemodplugin.cpp | 4 +- plugins/channelrx/demodbfm/bfmplugin.cpp | 4 +- plugins/channelrx/demoddatv/leansdr/dvb.h | 4 ++ plugins/channelrx/demoddatv/leansdr/math.h | 4 ++ plugins/channelrx/demoddsd/dsddemodplugin.cpp | 4 +- .../channelrx/demodfreedv/freedvplugin.cpp | 4 +- plugins/channelrx/demodnfm/nfmplugin.cpp | 4 +- plugins/channelrx/demodssb/ssbplugin.cpp | 4 +- plugins/channelrx/demodwfm/wfmplugin.cpp | 4 +- .../freqtracker/freqtrackerplugin.cpp | 4 +- .../channelrx/localsink/localsinkplugin.cpp | 4 +- .../channelrx/remotesink/remotesinkplugin.cpp | 4 +- plugins/channelrx/udpsink/udpsinkplugin.cpp | 4 +- .../localsource/localsourceplugin.cpp | 4 +- plugins/channeltx/modam/ammodplugin.cpp | 4 +- plugins/channeltx/modatv/atvmodplugin.cpp | 4 +- .../channeltx/modfreedv/freedvmodplugin.cpp | 4 +- plugins/channeltx/modnfm/nfmmodplugin.cpp | 4 +- plugins/channeltx/modssb/ssbmodplugin.cpp | 4 +- plugins/channeltx/modwfm/wfmmodplugin.cpp | 4 +- .../remotesource/remotesourceplugin.cpp | 4 +- .../channeltx/udpsource/udpsourceplugin.cpp | 4 +- .../bladerf1output/bladerf1outputplugin.cpp | 6 +-- .../bladerf2output/bladerf2outputplugin.cpp | 6 +-- .../samplesink/filesink/filesinkplugin.cpp | 6 +-- .../hackrfoutput/hackrfoutputplugin.cpp | 6 +-- .../limesdroutput/limesdroutputplugin.cpp | 6 +-- .../localoutput/localoutputplugin.cpp | 6 +-- .../plutosdroutput/plutosdroutputplugin.cpp | 6 +-- .../remoteoutput/remoteoutputplugin.cpp | 6 +-- .../soapysdroutput/soapysdroutputplugin.cpp | 6 +-- .../xtrxoutput/xtrxoutputplugin.cpp | 6 +-- plugins/samplesource/airspy/airspyplugin.cpp | 6 +-- .../samplesource/airspyhf/airspyhfplugin.cpp | 6 +-- .../bladerf1input/bladerf1inputplugin.cpp | 6 +-- .../bladerf2input/bladerf2inputplugin.cpp | 6 +-- plugins/samplesource/fcdpro/fcdproplugin.cpp | 6 +-- .../fcdproplus/fcdproplusplugin.cpp | 6 +-- .../filesource/filesourceplugin.cpp | 6 +-- .../hackrfinput/hackrfinputplugin.cpp | 6 +-- .../limesdrinput/limesdrinputplugin.cpp | 6 +-- .../localinput/localinputplugin.cpp | 6 +-- .../samplesource/perseus/perseusplugin.cpp | 6 +-- .../plutosdrinput/plutosdrinputplugin.cpp | 6 +-- .../remoteinput/remoteinputplugin.cpp | 6 +-- plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 6 +-- .../samplesource/sdrplay/sdrplayplugin.cpp | 6 +-- .../soapysdrinput/soapysdrinputplugin.cpp | 6 +-- .../testsource/testsourceplugin.cpp | 6 +-- .../xtrxinput/xtrxinputplugin.cpp | 6 +-- sdrbase/channel/remotedataqueue.h | 4 +- sdrbase/channel/remotedatareadqueue.h | 4 +- sdrgui/gui/comboboxnoarrow.cpp | 4 +- sdrsrv/maincore.cpp | 2 - sdrsrv/maincore.h | 2 +- sdrsrv/webapi/webapiadaptersrv.cpp | 38 +++++++++---------- 59 files changed, 174 insertions(+), 153 deletions(-) diff --git a/appsrv/main.cpp b/appsrv/main.cpp index a72fd0892..475e80f93 100644 --- a/appsrv/main.cpp +++ b/appsrv/main.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include "loggerwithfile.h" diff --git a/exports/export.h b/exports/export.h index f1bb36a13..7f4b7600b 100644 --- a/exports/export.h +++ b/exports/export.h @@ -55,6 +55,18 @@ # define SDRGUI_API #endif +/* the 'SDRSRV_API' controls the import/export of 'sdrsrv' symbols + */ +#if !defined(sdrangel_STATIC) +# ifdef sdrsrv_EXPORTS +# define SDRSRV_API __SDR_EXPORT +# else +# define SDRSRV_API __SDR_IMPORT +# endif +#else +# define SDRSRV_API +#endif + /* the 'DEVICES_API' controls the import/export of 'devices' symbols */ #if !defined(sdrangel_STATIC) diff --git a/libfreedv/cohpsk.cpp b/libfreedv/cohpsk.cpp index 5b304dd6b..346e2c8f4 100644 --- a/libfreedv/cohpsk.cpp +++ b/libfreedv/cohpsk.cpp @@ -310,8 +310,8 @@ void qpsk_symbols_to_bits(struct COHPSK *coh, float rx_bits[], COMP ct_symb_buf[ COMP y[NPILOTSFRAME+2], yfit; COMP rx_symb_linear[NSYMROW*COHPSK_NC*ND]; COMP m, b; - COMP __attribute__((unused)) corr, rot, pi_on_4, phi_rect, div_symb; - float mag, __attribute__((unused)) phi_, __attribute__((unused)) amp_; + COMP corr, rot, pi_on_4, phi_rect, div_symb; + float mag, phi_, amp_; float sum_x, sum_xx, noise_var; COMP s; diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index f3e285ccb..7a06ed90a 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -37,8 +37,8 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index a2e993c40..a22268eea 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -56,8 +56,8 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* BFMPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/demoddatv/leansdr/dvb.h b/plugins/channelrx/demoddatv/leansdr/dvb.h index a3d1d8a10..66676f536 100644 --- a/plugins/channelrx/demoddatv/leansdr/dvb.h +++ b/plugins/channelrx/demoddatv/leansdr/dvb.h @@ -24,6 +24,10 @@ #include "leansdr/sdr.h" #include "leansdr/viterbi.h" +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + namespace leansdr { diff --git a/plugins/channelrx/demoddatv/leansdr/math.h b/plugins/channelrx/demoddatv/leansdr/math.h index 629569d4b..3a6d84a7c 100644 --- a/plugins/channelrx/demoddatv/leansdr/math.h +++ b/plugins/channelrx/demoddatv/leansdr/math.h @@ -20,6 +20,10 @@ #include #include +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + namespace leansdr { diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index d421183dd..861d582af 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -55,8 +55,8 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/demodfreedv/freedvplugin.cpp b/plugins/channelrx/demodfreedv/freedvplugin.cpp index f965e8948..0479e16d0 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.cpp +++ b/plugins/channelrx/demodfreedv/freedvplugin.cpp @@ -54,8 +54,8 @@ void FreeDVPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 3f6f3291f..6c9817207 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -37,8 +37,8 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* NFMPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index 7698bdc38..41f1e6d7f 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -37,8 +37,8 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* SSBPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index 6cc994f53..7e80a11af 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -38,8 +38,8 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* WFMPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp index 195a62ff1..41760b8fa 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp @@ -54,8 +54,8 @@ void FreqTrackerPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/localsink/localsinkplugin.cpp b/plugins/channelrx/localsink/localsinkplugin.cpp index 861e5d1e0..8d89e9fe3 100644 --- a/plugins/channelrx/localsink/localsinkplugin.cpp +++ b/plugins/channelrx/localsink/localsinkplugin.cpp @@ -55,8 +55,8 @@ void LocalSinkPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp index 2ed2f4016..883baaa52 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.cpp +++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp @@ -55,8 +55,8 @@ void RemoteSinkPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channelrx/udpsink/udpsinkplugin.cpp b/plugins/channelrx/udpsink/udpsinkplugin.cpp index a836885e6..628db8682 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.cpp +++ b/plugins/channelrx/udpsink/udpsinkplugin.cpp @@ -55,8 +55,8 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSink *rxChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSink *rxChannel) { return 0; } diff --git a/plugins/channeltx/localsource/localsourceplugin.cpp b/plugins/channeltx/localsource/localsourceplugin.cpp index f30f04eec..10d4ae134 100644 --- a/plugins/channeltx/localsource/localsourceplugin.cpp +++ b/plugins/channeltx/localsource/localsourceplugin.cpp @@ -55,8 +55,8 @@ void LocalSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index 715d5f8f7..5d2cbc413 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -54,8 +54,8 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* AMModPlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 8bec85526..44148b181 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -54,8 +54,8 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* ATVModPlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index b19fca180..c015d2190 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -54,8 +54,8 @@ void FreeDVModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 1c30dc6c6..28bc64fe4 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -54,8 +54,8 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* NFMModPlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index 49c0a5913..c877e5423 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -54,8 +54,8 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* SSBModPlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index ca3a65b01..863947233 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -54,8 +54,8 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* WFMModPlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/remotesource/remotesourceplugin.cpp b/plugins/channeltx/remotesource/remotesourceplugin.cpp index d9a5ef059..e3c17b02c 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.cpp +++ b/plugins/channeltx/remotesource/remotesourceplugin.cpp @@ -54,8 +54,8 @@ void RemoteSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index 94475424f..6b6eebc8c 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -56,8 +56,8 @@ void UDPSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI( - DeviceUISet *deviceUISet __attribute__((unused)), - BasebandSampleSource *txChannel __attribute__((unused))) + DeviceUISet *deviceUISet, + BasebandSampleSource *txChannel) { return 0; } diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp index c99c2b79e..ce4909600 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp @@ -110,9 +110,9 @@ PluginInterface::SamplingDevices Bladerf1OutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* Bladerf1OutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp index 4fa256407..5ca3322a8 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp @@ -114,9 +114,9 @@ PluginInterface::SamplingDevices BladeRF2OutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* BladeRF2OutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/filesink/filesinkplugin.cpp b/plugins/samplesink/filesink/filesinkplugin.cpp index ab3ee3b98..ca13bec86 100644 --- a/plugins/samplesink/filesink/filesinkplugin.cpp +++ b/plugins/samplesink/filesink/filesinkplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index 5f075f976..f57d4d157 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -123,9 +123,9 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index cab3c7cc0..7988caf86 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -113,9 +113,9 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/localoutput/localoutputplugin.cpp b/plugins/samplesink/localoutput/localoutputplugin.cpp index 82eb2f6f4..c924313fa 100644 --- a/plugins/samplesink/localoutput/localoutputplugin.cpp +++ b/plugins/samplesink/localoutput/localoutputplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices LocalOutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* LocalOutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp index 1f0a6cce8..04cb8d847 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp @@ -88,9 +88,9 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp index 0c86210c1..19ccc26ac 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices RemoteOutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* RemoteOutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp index 306bdd798..b3c6508f4 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp @@ -91,9 +91,9 @@ PluginInterface::SamplingDevices SoapySDROutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* SoapySDROutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp index 28eb2779e..7533ff75f 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp @@ -87,9 +87,9 @@ PluginInterface::SamplingDevices XTRXOutputPlugin::enumSampleSinks() #ifdef SERVER_MODE PluginInstanceGUI* XTRXOutputPlugin::createSampleSinkPluginInstanceGUI( - const QString& sinkId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sinkId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index a49661141..086542ad7 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -130,9 +130,9 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* AirspyPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp index 775b630ae..3085847a9 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp +++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp @@ -100,9 +100,9 @@ PluginInterface::SamplingDevices AirspyHFPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* AirspyHFPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp index 48b4a0713..923de349f 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp @@ -109,9 +109,9 @@ PluginInterface::SamplingDevices Blderf1InputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* Blderf1InputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp index daa815934..4668d8bc5 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp @@ -114,9 +114,9 @@ PluginInterface::SamplingDevices Blderf2InputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* Blderf2InputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp index cfcf53760..e2b55cc70 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.cpp +++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp @@ -82,9 +82,9 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index bf4dd3e62..81c4fe1b1 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -84,9 +84,9 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* FCDProPlusPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index bd7dbb0ba..73db3551a 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index c5e96d915..07d978707 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -125,9 +125,9 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index a7d2bfab3..472387e6d 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -112,9 +112,9 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/localinput/localinputplugin.cpp b/plugins/samplesource/localinput/localinputplugin.cpp index 2535330f0..145cbbfad 100644 --- a/plugins/samplesource/localinput/localinputplugin.cpp +++ b/plugins/samplesource/localinput/localinputplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices LocalInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* LocalInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp index a68c055ea..4bc899db8 100644 --- a/plugins/samplesource/perseus/perseusplugin.cpp +++ b/plugins/samplesource/perseus/perseusplugin.cpp @@ -90,9 +90,9 @@ PluginInterface::SamplingDevices PerseusPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* PerseusPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index 5d9d9e287..b96145312 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -90,9 +90,9 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* PlutoSDRInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.cpp b/plugins/samplesource/remoteinput/remoteinputplugin.cpp index 2a256aa69..2ecea04c1 100644 --- a/plugins/samplesource/remoteinput/remoteinputplugin.cpp +++ b/plugins/samplesource/remoteinput/remoteinputplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices RemoteInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* RemoteInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 6e11d42d0..263b5e7ff 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -70,9 +70,9 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index 239ea1f45..0b1bb5fad 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -93,9 +93,9 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* SDRPlayPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp index 06eeed49d..c15eb10f7 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp @@ -90,9 +90,9 @@ PluginInterface::SamplingDevices SoapySDRInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* SoapySDRInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute__((unused)), - QWidget **widget __attribute__((unused)), - DeviceUISet *deviceUISet __attribute__((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/testsource/testsourceplugin.cpp b/plugins/samplesource/testsource/testsourceplugin.cpp index df12ca9bb..4f1f7eff4 100644 --- a/plugins/samplesource/testsource/testsourceplugin.cpp +++ b/plugins/samplesource/testsource/testsourceplugin.cpp @@ -74,9 +74,9 @@ PluginInterface::SamplingDevices TestSourcePlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* TestSourcePlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp index b4a0d85cd..713e132a3 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp @@ -88,9 +88,9 @@ PluginInterface::SamplingDevices XTRXInputPlugin::enumSampleSources() #ifdef SERVER_MODE PluginInstanceGUI* XTRXInputPlugin::createSampleSourcePluginInstanceGUI( - const QString& sourceId __attribute((unused)), - QWidget **widget __attribute((unused)), - DeviceUISet *deviceUISet __attribute((unused))) + const QString& sourceId, + QWidget **widget, + DeviceUISet *deviceUISet) { return 0; } diff --git a/sdrbase/channel/remotedataqueue.h b/sdrbase/channel/remotedataqueue.h index d8737af49..316e502a1 100644 --- a/sdrbase/channel/remotedataqueue.h +++ b/sdrbase/channel/remotedataqueue.h @@ -29,9 +29,11 @@ #include #include +#include "export.h" + class RemoteDataBlock; -class RemoteDataQueue : public QObject { +class SDRBASE_API RemoteDataQueue : public QObject { Q_OBJECT public: diff --git a/sdrbase/channel/remotedatareadqueue.h b/sdrbase/channel/remotedatareadqueue.h index 6efa87254..6a6399f3f 100644 --- a/sdrbase/channel/remotedatareadqueue.h +++ b/sdrbase/channel/remotedatareadqueue.h @@ -27,10 +27,12 @@ #include +#include "export.h" + class RemoteDataBlock; class Sample; -class RemoteDataReadQueue +class SDRBASE_API RemoteDataReadQueue { public: RemoteDataReadQueue(); diff --git a/sdrgui/gui/comboboxnoarrow.cpp b/sdrgui/gui/comboboxnoarrow.cpp index 8b817dbed..c255852fd 100644 --- a/sdrgui/gui/comboboxnoarrow.cpp +++ b/sdrgui/gui/comboboxnoarrow.cpp @@ -20,7 +20,9 @@ #include "comboboxnoarrow.h" -void ComboBoxNoArrow::paintEvent (QPaintEvent *ev __attribute__((unused))) +// MSVC doesn't support __attribute__ +// maybe use #ifdef and __declspec(unused) as prefix for windows +void ComboBoxNoArrow::paintEvent (QPaintEvent *ev) { QPainter p; p.begin (this); diff --git a/sdrsrv/maincore.cpp b/sdrsrv/maincore.cpp index ee1c605bf..8aa3c5964 100644 --- a/sdrsrv/maincore.cpp +++ b/sdrsrv/maincore.cpp @@ -17,8 +17,6 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include - #include #include #include diff --git a/sdrsrv/maincore.h b/sdrsrv/maincore.h index a2a5e0e28..876ee1f6c 100644 --- a/sdrsrv/maincore.h +++ b/sdrsrv/maincore.h @@ -45,7 +45,7 @@ namespace qtwebapp { class LoggerWithFile; } -class MainCore : public QObject { +class SDRSRV_API MainCore : public QObject { Q_OBJECT public: diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp index b3635b7c4..9b237df55 100644 --- a/sdrsrv/webapi/webapiadaptersrv.cpp +++ b/sdrsrv/webapi/webapiadaptersrv.cpp @@ -22,8 +22,6 @@ #include #include -#include - #include "SWGInstanceSummaryResponse.h" #include "SWGInstanceDevicesResponse.h" #include "SWGInstanceChannelsResponse.h" @@ -70,7 +68,7 @@ WebAPIAdapterSrv::~WebAPIAdapterSrv() int WebAPIAdapterSrv::instanceSummary( SWGSDRangel::SWGInstanceSummaryResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { response.init(); *response.getAppname() = QCoreApplication::applicationName(); @@ -103,7 +101,7 @@ int WebAPIAdapterSrv::instanceSummary( int WebAPIAdapterSrv::instanceDelete( SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { MainCore::MsgDeleteInstance *msg = MainCore::MsgDeleteInstance::create(); m_mainCore.getInputMessageQueue()->push(msg); @@ -117,7 +115,7 @@ int WebAPIAdapterSrv::instanceDelete( int WebAPIAdapterSrv::instanceDevices( int direction, SWGSDRangel::SWGInstanceDevicesResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { response.init(); @@ -165,7 +163,7 @@ int WebAPIAdapterSrv::instanceDevices( int WebAPIAdapterSrv::instanceChannels( int direction, SWGSDRangel::SWGInstanceChannelsResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { response.init(); PluginAPI::ChannelRegistrations *channelRegistrations; @@ -209,7 +207,7 @@ int WebAPIAdapterSrv::instanceChannels( int WebAPIAdapterSrv::instanceLoggingGet( SWGSDRangel::SWGLoggingInfo& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { response.init(); response.setDumpToFile(m_mainCore.m_logger->getUseFileLogger() ? 1 : 0); @@ -227,7 +225,7 @@ int WebAPIAdapterSrv::instanceLoggingGet( int WebAPIAdapterSrv::instanceLoggingPut( SWGSDRangel::SWGLoggingInfo& query, SWGSDRangel::SWGLoggingInfo& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { // response input is the query actually bool dumpToFile = (query.getDumpToFile() != 0); @@ -264,7 +262,7 @@ int WebAPIAdapterSrv::instanceLoggingPut( int WebAPIAdapterSrv::instanceAudioGet( SWGSDRangel::SWGAudioDevices& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { const QList& audioInputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDevices(); const QList& audioOutputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDevices(); @@ -501,7 +499,7 @@ int WebAPIAdapterSrv::instanceAudioOutputDelete( int WebAPIAdapterSrv::instanceAudioInputCleanupPatch( SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { m_mainCore.m_dspEngine->getAudioDeviceManager()->inputInfosCleanup(); @@ -513,7 +511,7 @@ int WebAPIAdapterSrv::instanceAudioInputCleanupPatch( int WebAPIAdapterSrv::instanceAudioOutputCleanupPatch( SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { m_mainCore.m_dspEngine->getAudioDeviceManager()->outputInfosCleanup(); @@ -525,7 +523,7 @@ int WebAPIAdapterSrv::instanceAudioOutputCleanupPatch( int WebAPIAdapterSrv::instanceLocationGet( SWGSDRangel::SWGLocationInformation& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { response.init(); response.setLatitude(m_mainCore.m_settings.getLatitude()); @@ -536,7 +534,7 @@ int WebAPIAdapterSrv::instanceLocationGet( int WebAPIAdapterSrv::instanceLocationPut( SWGSDRangel::SWGLocationInformation& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { float latitude = response.getLatitude(); float longitude = response.getLongitude(); @@ -555,7 +553,7 @@ int WebAPIAdapterSrv::instanceLocationPut( int WebAPIAdapterSrv::instanceDVSerialGet( SWGSDRangel::SWGDVSeralDevices& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { response.init(); @@ -580,7 +578,7 @@ int WebAPIAdapterSrv::instanceDVSerialGet( int WebAPIAdapterSrv::instanceDVSerialPatch( bool dvserial, SWGSDRangel::SWGDVSeralDevices& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { m_mainCore.m_dspEngine->setDVSerialSupport(dvserial); response.init(); @@ -730,7 +728,7 @@ int WebAPIAdapterSrv::instancePresetFilePost( int WebAPIAdapterSrv::instancePresetsGet( SWGSDRangel::SWGPresets& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { int nbPresets = m_mainCore.m_settings.getPresetCount(); int nbGroups = 0; @@ -992,7 +990,7 @@ int WebAPIAdapterSrv::instancePresetDelete( int WebAPIAdapterSrv::instanceDeviceSetsGet( SWGSDRangel::SWGDeviceSetList& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { getDeviceSetList(&response); return 200; @@ -1001,7 +999,7 @@ int WebAPIAdapterSrv::instanceDeviceSetsGet( int WebAPIAdapterSrv::instanceDeviceSetPost( int direction, SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) + SWGSDRangel::SWGErrorResponse& error) { MainCore::MsgAddDeviceSet *msg = MainCore::MsgAddDeviceSet::create(direction); m_mainCore.m_inputMessageQueue.push(msg); @@ -1057,8 +1055,8 @@ int WebAPIAdapterSrv::devicesetGet( } int WebAPIAdapterSrv::devicesetFocusPatch( - int deviceSetIndex __attribute__((unused)), - SWGSDRangel::SWGSuccessResponse& response __attribute__((unused)), + int deviceSetIndex, + SWGSDRangel::SWGSuccessResponse& response, SWGSDRangel::SWGErrorResponse& error) { *error.getMessage() = QString("Not supported in server instance");