diff --git a/devices/bladerf/devicebladerf.h b/devices/bladerf/devicebladerf.h index 5ef31f3b8..73233a79b 100644 --- a/devices/bladerf/devicebladerf.h +++ b/devices/bladerf/devicebladerf.h @@ -19,7 +19,9 @@ #include -class DeviceBladeRF +#include "util/export.h" + +class DEVICES_API DeviceBladeRF { public: static bool open_bladerf(struct bladerf **dev, const char *serial); diff --git a/devices/bladerf/devicebladerfshared.h b/devices/bladerf/devicebladerfshared.h index 4ad706744..996d7deca 100644 --- a/devices/bladerf/devicebladerfshared.h +++ b/devices/bladerf/devicebladerfshared.h @@ -18,8 +18,9 @@ #define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_ #include "util/message.h" +#include "util/export.h" -class DeviceBladeRFShared +class DEVICES_API DeviceBladeRFShared { public: static const float m_sampleFifoLengthInSeconds; diff --git a/devices/bladerf/devicebladerfvalues.h b/devices/bladerf/devicebladerfvalues.h index 40efc736c..23f57706e 100644 --- a/devices/bladerf/devicebladerfvalues.h +++ b/devices/bladerf/devicebladerfvalues.h @@ -17,8 +17,9 @@ #ifndef DEVICES_BLADERF_DEVICEBLADERFVALUES_H_ #define DEVICES_BLADERF_DEVICEBLADERFVALUES_H_ +#include "util/export.h" -class DeviceBladeRFBandwidths { +class DEVICES_API DeviceBladeRFBandwidths { public: static unsigned int getBandwidth(unsigned int bandwidth_index); static unsigned int getBandwidthIndex(unsigned int bandwidth); diff --git a/devices/hackrf/devicehackrf.h b/devices/hackrf/devicehackrf.h index 483f6999f..72e78c048 100644 --- a/devices/hackrf/devicehackrf.h +++ b/devices/hackrf/devicehackrf.h @@ -19,7 +19,9 @@ #include "libhackrf/hackrf.h" -class DeviceHackRF +#include "util/export.h" + +class DEVICES_API DeviceHackRF { public: static DeviceHackRF& instance(); diff --git a/devices/hackrf/devicehackrfshared.h b/devices/hackrf/devicehackrfshared.h index f9106a8d3..cefa5c32a 100644 --- a/devices/hackrf/devicehackrfshared.h +++ b/devices/hackrf/devicehackrfshared.h @@ -18,8 +18,9 @@ #define DEVICES_HACKRF_DEVICEHACKRFSHARED_H_ #include "util/message.h" +#include "util/export.h" -class DeviceHackRFShared +class DEVICES_API DeviceHackRFShared { public: class MsgConfigureFrequencyDelta : public Message diff --git a/devices/hackrf/devicehackrfvalues.h b/devices/hackrf/devicehackrfvalues.h index 3059473c8..d322e4d06 100644 --- a/devices/hackrf/devicehackrfvalues.h +++ b/devices/hackrf/devicehackrfvalues.h @@ -17,7 +17,9 @@ #ifndef DEVICES_HACKRF_DEVICEHACKRFVALUES_H_ #define DEVICES_HACKRF_DEVICEHACKRFVALUES_H_ -class HackRFBandwidths { +#include "util/export.h" + +class DEVICES_API HackRFBandwidths { public: static unsigned int getBandwidth(unsigned int bandwidth_index); static unsigned int getBandwidthIndex(unsigned int bandwidth); diff --git a/devices/limesdr/devicelimesdr.h b/devices/limesdr/devicelimesdr.h index 01421277f..f409b31ed 100644 --- a/devices/limesdr/devicelimesdr.h +++ b/devices/limesdr/devicelimesdr.h @@ -19,7 +19,9 @@ #include "lime/LimeSuite.h" -class DeviceLimeSDR +#include "util/export.h" + +class DEVICES_API DeviceLimeSDR { public: enum PathRxRFE diff --git a/devices/limesdr/devicelimesdrparam.h b/devices/limesdr/devicelimesdrparam.h index 1bc6cdd78..e34251d1b 100644 --- a/devices/limesdr/devicelimesdrparam.h +++ b/devices/limesdr/devicelimesdrparam.h @@ -19,6 +19,8 @@ #include "lime/LimeSuite.h" +#include "util/export.h" + /** * This structure refers to one physical device shared among parties (logical devices represented by * the DeviceSinkAPI or DeviceSourceAPI). @@ -26,7 +28,7 @@ * 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 DeviceLimeSDRParams +struct DEVICES_API DeviceLimeSDRParams { lms_device_t *m_dev; //!< device handle uint32_t m_nbRxChannels; //!< number of Rx channels (normally 2, we'll see if we really use it...) diff --git a/devices/limesdr/devicelimesdrshared.h b/devices/limesdr/devicelimesdrshared.h index d23894399..6d90a63b5 100644 --- a/devices/limesdr/devicelimesdrshared.h +++ b/devices/limesdr/devicelimesdrshared.h @@ -20,11 +20,12 @@ #include #include "devicelimesdrparam.h" #include "util/message.h" +#include "util/export.h" /** * Structure shared by a buddy with other buddies */ -class DeviceLimeSDRShared +class DEVICES_API DeviceLimeSDRShared { public: class MsgReportBuddyChange : public Message { diff --git a/devices/perseus/deviceperseus.h b/devices/perseus/deviceperseus.h index b4eb8d8f0..3305fdf54 100644 --- a/devices/perseus/deviceperseus.h +++ b/devices/perseus/deviceperseus.h @@ -19,7 +19,9 @@ #include "deviceperseusscan.h" -class DevicePerseus +#include "util/export.h" + +class DEVICES_API DevicePerseus { public: static DevicePerseus& instance(); diff --git a/devices/perseus/deviceperseusscan.h b/devices/perseus/deviceperseusscan.h index 8eb85677a..4c4e1b3d5 100644 --- a/devices/perseus/deviceperseusscan.h +++ b/devices/perseus/deviceperseusscan.h @@ -23,8 +23,9 @@ #include #include +#include "util/export.h" -class DevicePerseusScan +class DEVICES_API DevicePerseusScan { public: struct DeviceScan diff --git a/devices/plutosdr/deviceplutosdr.h b/devices/plutosdr/deviceplutosdr.h index 60795f755..dbae13e0d 100644 --- a/devices/plutosdr/deviceplutosdr.h +++ b/devices/plutosdr/deviceplutosdr.h @@ -22,7 +22,9 @@ #include "deviceplutosdrscan.h" #include "deviceplutosdrbox.h" -class DevicePlutoSDR +#include "util/export.h" + +class DEVICES_API DevicePlutoSDR { public: static DevicePlutoSDR& instance(); diff --git a/devices/plutosdr/deviceplutosdrbox.h b/devices/plutosdr/deviceplutosdrbox.h index 0e2edb2f9..4f6ae948e 100644 --- a/devices/plutosdr/deviceplutosdrbox.h +++ b/devices/plutosdr/deviceplutosdrbox.h @@ -22,7 +22,9 @@ #include #include "deviceplutosdrscan.h" -class DevicePlutoSDRBox +#include "util/export.h" + +class DEVICES_API DevicePlutoSDRBox { public: typedef enum diff --git a/devices/plutosdr/deviceplutosdrparams.h b/devices/plutosdr/deviceplutosdrparams.h index 946106159..e318d3f72 100644 --- a/devices/plutosdr/deviceplutosdrparams.h +++ b/devices/plutosdr/deviceplutosdrparams.h @@ -19,7 +19,9 @@ #include -class DevicePlutoSDRBox; +#include "util/export.h" + +class DEVICES_API DevicePlutoSDRBox; /** * This structure refers to one physical device shared among parties (logical devices represented by diff --git a/devices/plutosdr/deviceplutosdrscan.h b/devices/plutosdr/deviceplutosdrscan.h index 1cb7c607a..1ad1d0d41 100644 --- a/devices/plutosdr/deviceplutosdrscan.h +++ b/devices/plutosdr/deviceplutosdrscan.h @@ -21,7 +21,9 @@ #include #include -class DevicePlutoSDRScan +#include "util/export.h" + +class DEVICES_API DevicePlutoSDRScan { public: struct DeviceScan diff --git a/devices/plutosdr/deviceplutosdrshared.h b/devices/plutosdr/deviceplutosdrshared.h index 211da350c..5ae24df29 100644 --- a/devices/plutosdr/deviceplutosdrshared.h +++ b/devices/plutosdr/deviceplutosdrshared.h @@ -20,13 +20,14 @@ #include #include "util/message.h" +#include "util/export.h" class DevicePlutoSDRParams; /** * Structure shared by a buddy with other buddies */ -class DevicePlutoSDRShared +class DEVICES_API DevicePlutoSDRShared { public: /** diff --git a/httpserver/CMakeLists.txt b/httpserver/CMakeLists.txt index 31d74f277..089ae7d9e 100644 --- a/httpserver/CMakeLists.txt +++ b/httpserver/CMakeLists.txt @@ -33,6 +33,7 @@ set(httpserver_HEADERS include_directories( . + ${CMAKE_SOURCE_DIR}/sdrbase ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/httpserver/httpconnectionhandler.h b/httpserver/httpconnectionhandler.h index b93c73432..e205b6585 100644 --- a/httpserver/httpconnectionhandler.h +++ b/httpserver/httpconnectionhandler.h @@ -18,6 +18,8 @@ #include "httprequesthandler.h" #include "httplistenersettings.h" +#include "util/export.h" + namespace qtwebapp { /** Alias type definition, for compatibility to different Qt versions */ @@ -47,7 +49,7 @@ namespace qtwebapp { The readTimeout value defines the maximum time to wait for a complete HTTP request. @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize. */ -class DECLSPEC HttpConnectionHandler : public QThread { +class HTTPSERVER_API HttpConnectionHandler : public QThread { Q_OBJECT Q_DISABLE_COPY(HttpConnectionHandler) diff --git a/httpserver/httpconnectionhandlerpool.h b/httpserver/httpconnectionhandlerpool.h index 3122a6d20..f264d650b 100644 --- a/httpserver/httpconnectionhandlerpool.h +++ b/httpserver/httpconnectionhandlerpool.h @@ -9,6 +9,8 @@ #include "httpconnectionhandler.h" #include "httplistenersettings.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -46,7 +48,7 @@ namespace qtwebapp { @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize */ -class DECLSPEC HttpConnectionHandlerPool : public QObject { +class HTTPSERVER_API HttpConnectionHandlerPool : public QObject { Q_OBJECT Q_DISABLE_COPY(HttpConnectionHandlerPool) public: diff --git a/httpserver/httpcookie.h b/httpserver/httpcookie.h index 2075554d5..58c84a66b 100644 --- a/httpserver/httpcookie.h +++ b/httpserver/httpcookie.h @@ -10,6 +10,8 @@ #include #include "httpglobal.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -18,7 +20,7 @@ namespace qtwebapp { 2109. */ -class DECLSPEC HttpCookie +class HTTPSERVER_API HttpCookie { public: diff --git a/httpserver/httplistener.h b/httpserver/httplistener.h index aa3168de8..d7b5c0282 100644 --- a/httpserver/httplistener.h +++ b/httpserver/httplistener.h @@ -15,6 +15,8 @@ #include "httprequesthandler.h" #include "httplistenersettings.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -42,7 +44,7 @@ namespace qtwebapp { @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize */ -class DECLSPEC HttpListener : public QTcpServer { +class HTTPSERVER_API HttpListener : public QTcpServer { Q_OBJECT Q_DISABLE_COPY(HttpListener) public: diff --git a/httpserver/httprequest.h b/httpserver/httprequest.h index 79cd2bbee..acca03652 100644 --- a/httpserver/httprequest.h +++ b/httpserver/httprequest.h @@ -17,6 +17,8 @@ #include "httpglobal.h" #include "httplistenersettings.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -36,7 +38,7 @@ namespace qtwebapp { The body is always a little larger than the file itself. */ -class DECLSPEC HttpRequest { +class HTTPSERVER_API HttpRequest { Q_DISABLE_COPY(HttpRequest) friend class HttpSessionStore; diff --git a/httpserver/httprequesthandler.h b/httpserver/httprequesthandler.h index 862baf89c..c2aa08736 100644 --- a/httpserver/httprequesthandler.h +++ b/httpserver/httprequesthandler.h @@ -10,6 +10,8 @@ #include "httprequest.h" #include "httpresponse.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -24,7 +26,7 @@ namespace qtwebapp { @see StaticFileController which delivers static local files. */ -class DECLSPEC HttpRequestHandler : public QObject { +class HTTPSERVER_API HttpRequestHandler : public QObject { Q_OBJECT Q_DISABLE_COPY(HttpRequestHandler) public: diff --git a/httpserver/httpresponse.h b/httpserver/httpresponse.h index 044484b79..4270a37cb 100644 --- a/httpserver/httpresponse.h +++ b/httpserver/httpresponse.h @@ -12,6 +12,8 @@ #include "httpglobal.h" #include "httpcookie.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -33,7 +35,7 @@ namespace qtwebapp { before calling write(). Web Browsers use that information to display a progress bar. */ -class DECLSPEC HttpResponse { +class HTTPSERVER_API HttpResponse { Q_DISABLE_COPY(HttpResponse) public: diff --git a/httpserver/httpsession.h b/httpserver/httpsession.h index dabe982c2..ed7e673cc 100644 --- a/httpserver/httpsession.h +++ b/httpserver/httpsession.h @@ -11,6 +11,8 @@ #include #include "httpglobal.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -20,7 +22,7 @@ namespace qtwebapp { @see HttpSessionStore should be used to create and get instances of this class. */ -class DECLSPEC HttpSession { +class HTTPSERVER_API HttpSession { public: @@ -53,7 +55,7 @@ public: QByteArray getId() const; /** - Null sessions cannot store data. All calls to set() and remove() + Null sessions cannot store data. All calls to set() and remove() do not have any effect.This method is thread safe. */ bool isNull() const; diff --git a/httpserver/httpsessionstore.h b/httpserver/httpsessionstore.h index 395ff8530..301bc329d 100644 --- a/httpserver/httpsessionstore.h +++ b/httpserver/httpsessionstore.h @@ -16,6 +16,8 @@ #include "httprequest.h" #include "httpsessionssettings.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -33,7 +35,7 @@ namespace qtwebapp { */ -class DECLSPEC HttpSessionStore : public QObject { +class HTTPSERVER_API HttpSessionStore : public QObject { Q_OBJECT Q_DISABLE_COPY(HttpSessionStore) public: diff --git a/httpserver/staticfilecontroller.h b/httpserver/staticfilecontroller.h index f369181e3..2ff346e85 100644 --- a/httpserver/staticfilecontroller.h +++ b/httpserver/staticfilecontroller.h @@ -13,6 +13,8 @@ #include "httpresponse.h" #include "httprequesthandler.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -44,7 +46,7 @@ namespace qtwebapp { class HttpDocrootSettings; -class DECLSPEC StaticFileController : public HttpRequestHandler { +class HTTPSERVER_API StaticFileController : public HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(StaticFileController) public: diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt index 4c615fae8..c3e3d18f5 100644 --- a/logging/CMakeLists.txt +++ b/logging/CMakeLists.txt @@ -19,6 +19,7 @@ set(httpserver_HEADERS include_directories( . + ${CMAKE_SOURCE_DIR}/sdrbase ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/logging/dualfilelogger.h b/logging/dualfilelogger.h index 6fb16c568..6599d6542 100644 --- a/logging/dualfilelogger.h +++ b/logging/dualfilelogger.h @@ -13,6 +13,8 @@ #include "logger.h" #include "filelogger.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -21,7 +23,7 @@ namespace qtwebapp { @see FileLogger for a description of the two underlying loggers. */ -class DECLSPEC DualFileLogger : public Logger { +class LOGGING_API DualFileLogger : public Logger { Q_OBJECT Q_DISABLE_COPY(DualFileLogger) public: diff --git a/logging/filelogger.h b/logging/filelogger.h index 7e23a303d..62eb04cc0 100644 --- a/logging/filelogger.h +++ b/logging/filelogger.h @@ -15,6 +15,8 @@ #include "logger.h" #include "fileloggersettings.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -49,7 +51,7 @@ namespace qtwebapp { @see Logger for a descrition of the buffer. */ -class DECLSPEC FileLogger : public Logger { +class LOGGING_API FileLogger : public Logger { Q_OBJECT Q_DISABLE_COPY(FileLogger) public: diff --git a/logging/logger.h b/logging/logger.h index 17353333a..ba7de727b 100644 --- a/logging/logger.h +++ b/logging/logger.h @@ -15,6 +15,8 @@ #include "logglobal.h" #include "logmessage.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -47,7 +49,7 @@ namespace qtwebapp { because logging to the console is less useful. */ -class DECLSPEC Logger : public QObject { +class LOGGING_API Logger : public QObject { Q_OBJECT Q_DISABLE_COPY(Logger) public: diff --git a/logging/loggerwithfile.h b/logging/loggerwithfile.h index 526e28df7..defa586cd 100644 --- a/logging/loggerwithfile.h +++ b/logging/loggerwithfile.h @@ -12,6 +12,8 @@ #include "logger.h" #include "filelogger.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -20,7 +22,7 @@ namespace qtwebapp { @see Logger for a description of the console loger. */ -class DECLSPEC LoggerWithFile : public Logger { +class LOGGING_API LoggerWithFile : public Logger { Q_OBJECT Q_DISABLE_COPY(LoggerWithFile) diff --git a/logging/logmessage.h b/logging/logmessage.h index c84c83b4d..3552f6be0 100644 --- a/logging/logmessage.h +++ b/logging/logmessage.h @@ -11,6 +11,8 @@ #include #include "logglobal.h" +#include "util/export.h" + namespace qtwebapp { /** @@ -33,7 +35,7 @@ namespace qtwebapp { - {line} Line number where the message was generated */ -class DECLSPEC LogMessage +class LOGGING_API LogMessage { Q_DISABLE_COPY(LogMessage) public: diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt index 38e1502f2..0ddab281d 100644 --- a/qrtplib/CMakeLists.txt +++ b/qrtplib/CMakeLists.txt @@ -92,6 +92,7 @@ set(qrtplib_SOURCES include_directories( . + ${CMAKE_SOURCE_DIR}/sdrbase ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/qrtplib/rtcpapppacket.h b/qrtplib/rtcpapppacket.h index ab4839c18..d8f36efa0 100644 --- a/qrtplib/rtcpapppacket.h +++ b/qrtplib/rtcpapppacket.h @@ -43,13 +43,15 @@ #include "rtpstructs.h" #include "rtpendian.h" +#include "util/export.h" + namespace qrtplib { class RTCPCompoundPacket; /** Describes an RTCP APP packet. */ -class RTCPAPPPacket: public RTCPPacket +class QRTPLIB_API RTCPAPPPacket: public RTCPPacket { public: /** Creates an instance based on the data in \c data with length \c datalen. diff --git a/qrtplib/rtcpbyepacket.h b/qrtplib/rtcpbyepacket.h index 993d40df4..f6f9493e0 100644 --- a/qrtplib/rtcpbyepacket.h +++ b/qrtplib/rtcpbyepacket.h @@ -43,13 +43,15 @@ #include "rtpstructs.h" #include "rtpendian.h" +#include "util/export.h" + namespace qrtplib { class RTCPCompoundPacket; /** Describes an RTCP BYE packet. */ -class RTCPBYEPacket: public RTCPPacket +class QRTPLIB_API RTCPBYEPacket: public RTCPPacket { public: /** Creates an instance based on the data in \c data with length \c datalen. diff --git a/qrtplib/rtcpcompoundpacket.h b/qrtplib/rtcpcompoundpacket.h index e84b6aa70..446504266 100644 --- a/qrtplib/rtcpcompoundpacket.h +++ b/qrtplib/rtcpcompoundpacket.h @@ -43,6 +43,8 @@ #include "rtpendian.h" #include +#include "util/export.h" + namespace qrtplib { @@ -50,7 +52,7 @@ class RTPRawPacket; class RTCPPacket; /** Represents an RTCP compound packet. */ -class RTCPCompoundPacket +class QRTPLIB_API RTCPCompoundPacket { public: /** Creates an RTCPCompoundPacket instance from the data in \c rawpack, installing a memory manager if specified. */ diff --git a/qrtplib/rtcpcompoundpacketbuilder.h b/qrtplib/rtcpcompoundpacketbuilder.h index 4a1fccfd9..834599ad5 100644 --- a/qrtplib/rtcpcompoundpacketbuilder.h +++ b/qrtplib/rtcpcompoundpacketbuilder.h @@ -46,6 +46,8 @@ #include "rtpendian.h" #include +#include "util/export.h" + namespace qrtplib { @@ -55,7 +57,7 @@ namespace qrtplib * been built successfully. The member functions described below return \c ERR_RTP_RTCPCOMPPACKBUILDER_NOTENOUGHBYTESLEFT * if the action would cause the maximum allowed size to be exceeded. */ -class RTCPCompoundPacketBuilder: public RTCPCompoundPacket +class QRTPLIB_API RTCPCompoundPacketBuilder: public RTCPCompoundPacket { public: /** Constructs an RTCPCompoundPacketBuilder instance, optionally installing a memory manager. */ diff --git a/qrtplib/rtcppacketbuilder.h b/qrtplib/rtcppacketbuilder.h index cfd612fc2..c19f5a725 100644 --- a/qrtplib/rtcppacketbuilder.h +++ b/qrtplib/rtcppacketbuilder.h @@ -44,6 +44,8 @@ #include "rtcpsdesinfo.h" #include "rtptimeutilities.h" +#include "util/export.h" + namespace qrtplib { @@ -59,7 +61,7 @@ class RTCPCompoundPacketBuilder; * an RTPSources instance to automatically generate the next compound packet which should be sent. It also * provides functions to determine when SDES items other than the CNAME item should be sent. */ -class RTCPPacketBuilder +class QRTPLIB_API RTCPPacketBuilder { public: /** Creates an RTCPPacketBuilder instance. diff --git a/qrtplib/rtcprrpacket.h b/qrtplib/rtcprrpacket.h index 66d158bb1..2ca047ffb 100644 --- a/qrtplib/rtcprrpacket.h +++ b/qrtplib/rtcprrpacket.h @@ -43,13 +43,15 @@ #include "rtpstructs.h" #include "rtpendian.h" +#include "util/export.h" + namespace qrtplib { class RTCPCompoundPacket; /** Describes an RTCP receiver report packet. */ -class RTCPRRPacket: public RTCPPacket +class QRTPLIB_API RTCPRRPacket: public RTCPPacket { public: /** Creates an instance based on the data in \c data with length \c datalen. diff --git a/qrtplib/rtcpscheduler.h b/qrtplib/rtcpscheduler.h index f7bc84a47..a9272ed34 100644 --- a/qrtplib/rtcpscheduler.h +++ b/qrtplib/rtcpscheduler.h @@ -43,6 +43,8 @@ #include "rtprandom.h" #include +#include "util/export.h" + namespace qrtplib { @@ -51,7 +53,7 @@ class RTPPacket; class RTPSources; /** Describes parameters used by the RTCPScheduler class. */ -class RTCPSchedulerParams +class QRTPLIB_API RTCPSchedulerParams { public: RTCPSchedulerParams(); diff --git a/qrtplib/rtcpsdesinfo.h b/qrtplib/rtcpsdesinfo.h index 34e169cc0..65cfaa0b7 100644 --- a/qrtplib/rtcpsdesinfo.h +++ b/qrtplib/rtcpsdesinfo.h @@ -45,11 +45,13 @@ #include #include +#include "util/export.h" + namespace qrtplib { /** The class RTCPSDESInfo is a container for RTCP SDES information. */ -class RTCPSDESInfo +class QRTPLIB_API RTCPSDESInfo { public: /** Constructs an instance, optionally installing a memory manager. */ diff --git a/qrtplib/rtcpsdespacket.h b/qrtplib/rtcpsdespacket.h index 72cdb5b3c..eaa7c6744 100644 --- a/qrtplib/rtcpsdespacket.h +++ b/qrtplib/rtcpsdespacket.h @@ -44,13 +44,15 @@ #include "rtpdefines.h" #include "rtpendian.h" +#include "util/export.h" + namespace qrtplib { class RTCPCompoundPacket; /** Describes an RTCP source description packet. */ -class RTCPSDESPacket: public RTCPPacket +class QRTPLIB_API RTCPSDESPacket: public RTCPPacket { public: /** Identifies the type of an SDES item. */ diff --git a/qrtplib/rtcpsrpacket.h b/qrtplib/rtcpsrpacket.h index cb6c6e29d..20131fc5e 100644 --- a/qrtplib/rtcpsrpacket.h +++ b/qrtplib/rtcpsrpacket.h @@ -44,13 +44,15 @@ #include "rtpstructs.h" #include "rtpendian.h" +#include "util/export.h" + namespace qrtplib { class RTCPCompoundPacket; /** Describes an RTCP sender report packet. */ -class RTCPSRPacket: public RTCPPacket +class QRTPLIB_API RTCPSRPacket: public RTCPPacket { public: /** Creates an instance based on the data in \c data with length \c datalen. diff --git a/qrtplib/rtpabortdescriptors.h b/qrtplib/rtpabortdescriptors.h index 2ccdc1919..cab7f68b6 100644 --- a/qrtplib/rtpabortdescriptors.h +++ b/qrtplib/rtpabortdescriptors.h @@ -41,6 +41,8 @@ #include "rtpconfig.h" #include "rtpsocketutil.h" +#include "util/export.h" + namespace qrtplib { @@ -61,7 +63,7 @@ namespace qrtplib * uses a single poll thread for several RTPSession and RTPTransmitter instances. * This idea is further illustrated in `example8.cpp`. */ -class RTPAbortDescriptors +class QRTPLIB_API RTPAbortDescriptors { public: RTPAbortDescriptors(); diff --git a/qrtplib/rtpaddress.h b/qrtplib/rtpaddress.h index 68f07bd80..68324b3fe 100644 --- a/qrtplib/rtpaddress.h +++ b/qrtplib/rtpaddress.h @@ -43,11 +43,13 @@ #include #include +#include "util/export.h" + namespace qrtplib { /** This class is an abstract class which is used to specify destinations, multicast groups etc. */ -class RTPAddress +class QRTPLIB_API RTPAddress { public: /** Returns the type of address the actual implementation represents. */ diff --git a/qrtplib/rtpcollisionlist.h b/qrtplib/rtpcollisionlist.h index 60c63a051..e8c5e2616 100644 --- a/qrtplib/rtpcollisionlist.h +++ b/qrtplib/rtpcollisionlist.h @@ -43,13 +43,15 @@ #include "rtptimeutilities.h" #include +#include "util/export.h" + namespace qrtplib { class RTPAddress; /** This class represents a list of addresses from which SSRC collisions were detected. */ -class RTPCollisionList +class QRTPLIB_API RTPCollisionList { public: /** Constructs an instance, optionally installing a memory manager. */ diff --git a/qrtplib/rtpexternaltransmitter.h b/qrtplib/rtpexternaltransmitter.h index 9cfc82fdc..d937d68e4 100644 --- a/qrtplib/rtpexternaltransmitter.h +++ b/qrtplib/rtpexternaltransmitter.h @@ -43,6 +43,8 @@ #include "rtpabortdescriptors.h" #include +#include "util/export.h" + namespace qrtplib { @@ -56,7 +58,7 @@ class RTPExternalTransmitter; * so that the transmitter will call the \c SendRTP, \c SendRTCP and \c ComesFromThisSender * methods of this instance when needed. */ -class RTPExternalSender +class QRTPLIB_API RTPExternalSender { public: RTPExternalSender() diff --git a/qrtplib/rtpinternalsourcedata.h b/qrtplib/rtpinternalsourcedata.h index 120e903d6..f36f8eba9 100644 --- a/qrtplib/rtpinternalsourcedata.h +++ b/qrtplib/rtpinternalsourcedata.h @@ -44,10 +44,12 @@ #include "rtptimeutilities.h" #include "rtpsources.h" +#include "util/export.h" + namespace qrtplib { -class RTPInternalSourceData: public RTPSourceData +class QRTPLIB_API RTPInternalSourceData: public RTPSourceData { public: RTPInternalSourceData(uint32_t ssrc); diff --git a/qrtplib/rtpipv4address.h b/qrtplib/rtpipv4address.h index 5d0b86639..0253d9be3 100644 --- a/qrtplib/rtpipv4address.h +++ b/qrtplib/rtpipv4address.h @@ -42,6 +42,8 @@ #include "rtpaddress.h" #include "rtptypes.h" +#include "util/export.h" + namespace qrtplib { @@ -51,7 +53,7 @@ namespace qrtplib * number is ignored. When an instance is used in one of the accept or ignore functions of the * transmitter, a zero port number represents all ports for the specified IP address. */ -class RTPIPv4Address: public RTPAddress +class QRTPLIB_API RTPIPv4Address: public RTPAddress { public: /** Creates an instance with IP address \c ip and port number \c port (both diff --git a/qrtplib/rtpipv4destination.h b/qrtplib/rtpipv4destination.h index e4a5ed073..32491bdcc 100644 --- a/qrtplib/rtpipv4destination.h +++ b/qrtplib/rtpipv4destination.h @@ -49,10 +49,12 @@ #include #include +#include "util/export.h" + namespace qrtplib { -class RTPIPv4Destination +class QRTPLIB_API RTPIPv4Destination { public: RTPIPv4Destination() diff --git a/qrtplib/rtplibraryversion.h b/qrtplib/rtplibraryversion.h index eb4e2ad39..8f46255f6 100644 --- a/qrtplib/rtplibraryversion.h +++ b/qrtplib/rtplibraryversion.h @@ -42,13 +42,15 @@ #include #include +#include "util/export.h" + namespace qrtplib { /** * Used to provide information about the version of the library. */ -class RTPLibraryVersion +class QRTPLIB_API RTPLibraryVersion { public: /** Returns an instance of RTPLibraryVersion describing the version of the library. */ diff --git a/qrtplib/rtppacketbuilder.h b/qrtplib/rtppacketbuilder.h index 7bda2c4a9..6fe1cd689 100644 --- a/qrtplib/rtppacketbuilder.h +++ b/qrtplib/rtppacketbuilder.h @@ -45,6 +45,8 @@ #include "rtptimeutilities.h" #include "rtptypes.h" +#include "util/export.h" + namespace qrtplib { @@ -53,7 +55,7 @@ class RTPSources; /** This class can be used to build RTP packets and is a bit more high-level than the RTPPacket * class: it generates an SSRC identifier, keeps track of timestamp and sequence number etc. */ -class RTPPacketBuilder +class QRTPLIB_API RTPPacketBuilder { public: /** Constructs an instance which will use \c rtprand for generating random numbers diff --git a/qrtplib/rtprandom.h b/qrtplib/rtprandom.h index e7239f9a2..747f03cd3 100644 --- a/qrtplib/rtprandom.h +++ b/qrtplib/rtprandom.h @@ -42,13 +42,15 @@ #include "rtptypes.h" #include +#include "util/export.h" + #define RTPRANDOM_2POWMIN63 1.08420217248550443400745280086994171142578125e-19 namespace qrtplib { /** Interface for generating random numbers. */ -class RTPRandom +class QRTPLIB_API RTPRandom { public: RTPRandom() diff --git a/qrtplib/rtprandomrand48.h b/qrtplib/rtprandomrand48.h index 7974f07fe..6795c86b3 100644 --- a/qrtplib/rtprandomrand48.h +++ b/qrtplib/rtprandomrand48.h @@ -42,11 +42,13 @@ #include "rtprandom.h" #include +#include "util/export.h" + namespace qrtplib { /** A random number generator using the algorithm of the rand48 set of functions. */ -class RTPRandomRand48: public RTPRandom +class QRTPLIB_API RTPRandomRand48: public RTPRandom { public: RTPRandomRand48(); diff --git a/qrtplib/rtprandomrands.h b/qrtplib/rtprandomrands.h index d8c47e504..58f692a6c 100644 --- a/qrtplib/rtprandomrands.h +++ b/qrtplib/rtprandomrands.h @@ -41,13 +41,15 @@ #include "rtpconfig.h" #include "rtprandom.h" +#include "util/export.h" + namespace qrtplib { /** A random number generator which tries to use the \c rand_s function on the * Win32 platform. */ -class RTPRandomRandS: public RTPRandom +class QRTPLIB_API RTPRandomRandS: public RTPRandom { public: RTPRandomRandS(); diff --git a/qrtplib/rtprandomurandom.h b/qrtplib/rtprandomurandom.h index 0754d322c..4d5cf339c 100644 --- a/qrtplib/rtprandomurandom.h +++ b/qrtplib/rtprandomurandom.h @@ -42,11 +42,13 @@ #include "rtprandom.h" #include +#include "util/export.h" + namespace qrtplib { /** A random number generator which uses bytes delivered by the /dev/urandom device. */ -class RTPRandomURandom: public RTPRandom +class QRTPLIB_API RTPRandomURandom: public RTPRandom { public: RTPRandomURandom(); diff --git a/qrtplib/rtpsession.h b/qrtplib/rtpsession.h index 960c6aa5a..cf98baf65 100644 --- a/qrtplib/rtpsession.h +++ b/qrtplib/rtpsession.h @@ -50,6 +50,8 @@ #include "rtcpcompoundpacketbuilder.h" #include +#include "util/export.h" + namespace qrtplib { @@ -72,7 +74,7 @@ class RTCPAPPPacket; * \note The RTPSession class is not meant to be thread safe. The user should use some kind of locking * mechanism to prevent different threads from using the same RTPSession instance. */ -class RTPSession +class QRTPLIB_API RTPSession { public: /** Constructs an RTPSession instance, optionally using a specific instance of a random diff --git a/qrtplib/rtpsessionparams.h b/qrtplib/rtpsessionparams.h index b75517c42..9cf6cf790 100644 --- a/qrtplib/rtpsessionparams.h +++ b/qrtplib/rtpsessionparams.h @@ -44,6 +44,8 @@ #include "rtptimeutilities.h" #include "rtpsources.h" +#include "util/export.h" + namespace qrtplib { @@ -51,7 +53,7 @@ namespace qrtplib * Describes the parameters for to be used by an RTPSession instance. Note that the own timestamp * unit must be set to a valid number, otherwise the session can't be created. */ -class RTPSessionParams +class QRTPLIB_API RTPSessionParams { public: RTPSessionParams(); diff --git a/qrtplib/rtpsessionsources.h b/qrtplib/rtpsessionsources.h index 1649c0a90..92d6b727d 100644 --- a/qrtplib/rtpsessionsources.h +++ b/qrtplib/rtpsessionsources.h @@ -41,12 +41,14 @@ #include "rtpconfig.h" #include "rtpsources.h" +#include "util/export.h" + namespace qrtplib { class RTPSession; -class RTPSessionSources: public RTPSources +class QRTPLIB_API RTPSessionSources: public RTPSources { public: RTPSessionSources(RTPSession &sess) : diff --git a/qrtplib/rtpsourcedata.h b/qrtplib/rtpsourcedata.h index a2d83cf13..8958cb393 100644 --- a/qrtplib/rtpsourcedata.h +++ b/qrtplib/rtpsourcedata.h @@ -46,12 +46,14 @@ #include "rtpsources.h" #include +#include "util/export.h" + namespace qrtplib { class RTPAddress; -class RTCPSenderReportInfo +class QRTPLIB_API RTCPSenderReportInfo { public: RTCPSenderReportInfo() : diff --git a/qrtplib/rtpsources.h b/qrtplib/rtpsources.h index f549e71af..7ddff9bca 100644 --- a/qrtplib/rtpsources.h +++ b/qrtplib/rtpsources.h @@ -43,12 +43,14 @@ #include "rtcpsdespacket.h" #include "rtptypes.h" +#include "util/export.h" + #define RTPSOURCES_HASHSIZE 8317 namespace qrtplib { -class RTPSources_GetHashIndex +class QRTPLIB_API RTPSources_GetHashIndex { public: static int GetIndex(const uint32_t &ssrc) @@ -73,7 +75,7 @@ class RTPSourceData; * is used to identify packets from our own session. The class also provides some overridable functions * which can be used to catch certain events (new SSRC, SSRC collision, ...). */ -class RTPSources +class QRTPLIB_API RTPSources { public: /** Type of probation to use for new sources. */ diff --git a/qrtplib/rtptcpaddress.h b/qrtplib/rtptcpaddress.h index 83b33acd1..ba3a50bd1 100644 --- a/qrtplib/rtptcpaddress.h +++ b/qrtplib/rtptcpaddress.h @@ -43,6 +43,8 @@ #include "rtptypes.h" #include "rtpsocketutil.h" +#include "util/export.h" + namespace qrtplib { /** Represents a TCP 'address' and port. @@ -50,7 +52,7 @@ namespace qrtplib * should be used to send/receive data, and to know on which socket incoming data * was received. */ -class RTPTCPAddress: public RTPAddress +class QRTPLIB_API RTPTCPAddress: public RTPAddress { public: /** Creates an instance with which you can use a specific socket diff --git a/qrtplib/rtptcptransmitter.h b/qrtplib/rtptcptransmitter.h index 205e3c019..dc964c304 100644 --- a/qrtplib/rtptcptransmitter.h +++ b/qrtplib/rtptcptransmitter.h @@ -46,11 +46,13 @@ #include #include +#include "util/export.h" + namespace qrtplib { /** Parameters for the TCP transmitter. */ -class RTPTCPTransmissionParams: public RTPTransmissionParams +class QRTPLIB_API RTPTCPTransmissionParams: public RTPTransmissionParams { public: RTPTCPTransmissionParams(); diff --git a/qrtplib/rtptimeutilities.h b/qrtplib/rtptimeutilities.h index 0e9a4d28a..be885a0c0 100644 --- a/qrtplib/rtptimeutilities.h +++ b/qrtplib/rtptimeutilities.h @@ -46,6 +46,8 @@ #include #endif // RTP_HAVE_QUERYPERFORMANCECOUNTER +#include "util/export.h" + #define RTP_NTPTIMEOFFSET 2208988800UL #ifdef RTP_HAVE_VSUINT64SUFFIX @@ -63,7 +65,7 @@ namespace qrtplib * This is a simple wrapper for the most significant word (MSW) and least * significant word (LSW) of an NTP timestamp. */ -class RTPNTPTime +class QRTPLIB_API RTPNTPTime { public: /** This constructor creates and instance with MSW \c m and LSW \c l. */ @@ -92,7 +94,7 @@ private: * This class is used to specify wallclock time, delay intervals etc. * It stores a number of seconds and a number of microseconds. */ -class RTPTime +class QRTPLIB_API RTPTime { public: /** Returns an RTPTime instance representing the current wallclock time. @@ -392,7 +394,7 @@ inline bool RTPTime::operator>=(const RTPTime &t) const return m_t >= t.m_t; } -class RTPTimeInitializerObject +class QRTPLIB_API RTPTimeInitializerObject { public: RTPTimeInitializerObject(); @@ -404,7 +406,7 @@ private: int dummy; }; -extern RTPTimeInitializerObject timeinit; +extern QRTPLIB_API RTPTimeInitializerObject timeinit; } // end namespace diff --git a/qrtplib/rtpudptransmitter.h b/qrtplib/rtpudptransmitter.h index 3cdf8401d..ae298de9d 100644 --- a/qrtplib/rtpudptransmitter.h +++ b/qrtplib/rtpudptransmitter.h @@ -38,6 +38,8 @@ #include #include +#include "util/export.h" + #define RTPUDPV4TRANS_HASHSIZE 8317 #define RTPUDPV4TRANS_DEFAULTPORTBASE 5000 #define RTPUDPV4TRANS_RTPRECEIVEBUFFER 32768 @@ -51,7 +53,7 @@ namespace qrtplib { /** Parameters for the UDP transmitter. */ -class RTPUDPTransmissionParams: public RTPTransmissionParams +class QRTPLIB_API RTPUDPTransmissionParams: public RTPTransmissionParams { public: RTPUDPTransmissionParams(); @@ -253,7 +255,7 @@ inline RTPUDPTransmissionParams::RTPUDPTransmissionParams() : } /** Additional information about the UDP over IPv4 transmitter. */ -class RTPUDPTransmissionInfo: public RTPTransmissionInfo +class QRTPLIB_API RTPUDPTransmissionInfo: public RTPTransmissionInfo { public: RTPUDPTransmissionInfo(const std::list& iplist, QUdpSocket *rtpsock, QUdpSocket *rtcpsock, uint16_t rtpport, uint16_t rtcpport) : @@ -313,7 +315,7 @@ private: * are described by the class RTPUDPTransmissionParams. The GetTransmissionInfo member function * returns an instance of type RTPUDPTransmissionInfo. */ -class RTPUDPTransmitter: public RTPTransmitter +class QRTPLIB_API RTPUDPTransmitter: public RTPTransmitter { public: RTPUDPTransmitter(); diff --git a/qrtplib/rtpudpv4transmitter.h b/qrtplib/rtpudpv4transmitter.h index 109a4c093..aa9abac8b 100644 --- a/qrtplib/rtpudpv4transmitter.h +++ b/qrtplib/rtpudpv4transmitter.h @@ -47,6 +47,8 @@ #include "rtpabortdescriptors.h" #include +#include "util/export.h" + #define RTPUDPV4TRANS_HASHSIZE 8317 #define RTPUDPV4TRANS_DEFAULTPORTBASE 5000 @@ -59,7 +61,7 @@ namespace qrtplib { /** Parameters for the UDP over IPv4 transmitter. */ -class RTPUDPv4TransmissionParams: public RTPTransmissionParams +class QRTPLIB_API RTPUDPv4TransmissionParams: public RTPTransmissionParams { public: RTPUDPv4TransmissionParams(); @@ -294,7 +296,7 @@ inline RTPUDPv4TransmissionParams::RTPUDPv4TransmissionParams() : } /** Additional information about the UDP over IPv4 transmitter. */ -class RTPUDPv4TransmissionInfo: public RTPTransmissionInfo +class QRTPLIB_API RTPUDPv4TransmissionInfo: public RTPTransmissionInfo { public: RTPUDPv4TransmissionInfo(std::list iplist, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) : @@ -373,7 +375,7 @@ public: * argument require an argument of RTPIPv4Address. The GetTransmissionInfo member function * returns an instance of type RTPUDPv4TransmissionInfo. */ -class RTPUDPv4Transmitter: public RTPTransmitter +class QRTPLIB_API RTPUDPv4Transmitter: public RTPTransmitter { public: RTPUDPv4Transmitter(); diff --git a/qrtplib/rtpudpv4transmitternobind.h b/qrtplib/rtpudpv4transmitternobind.h index 2ab5c238e..5cef0a739 100644 --- a/qrtplib/rtpudpv4transmitternobind.h +++ b/qrtplib/rtpudpv4transmitternobind.h @@ -47,6 +47,8 @@ #include "rtpabortdescriptors.h" #include +#include "util/export.h" + #define RTPUDPV4TRANSNOBIND_HASHSIZE 8317 #define RTPUDPV4TRANSNOBIND_DEFAULTPORTBASE 5000 @@ -59,7 +61,7 @@ namespace qrtplib { /** Parameters for the UDP over IPv4 transmitter that does not automatically bind sockets */ -class RTPUDPv4TransmissionNoBindParams: public RTPTransmissionParams +class QRTPLIB_API RTPUDPv4TransmissionNoBindParams: public RTPTransmissionParams { public: RTPUDPv4TransmissionNoBindParams(); @@ -294,7 +296,7 @@ inline RTPUDPv4TransmissionNoBindParams::RTPUDPv4TransmissionNoBindParams() : } /** Additional information about the UDP over IPv4 transmitter that does not automatically bind sockets. */ -class RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo +class QRTPLIB_API RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo { public: RTPUDPv4TransmissionNoBindInfo(const QHostAddress& ip, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) : @@ -375,7 +377,7 @@ public: * This flavor of a RTPUDPv4Transmitter class does not automatically bind sockets. Use the * BindSockets method to do so. */ -class RTPUDPv4TransmitterNoBind: public RTPTransmitter +class QRTPLIB_API RTPUDPv4TransmitterNoBind: public RTPTransmitter { public: RTPUDPv4TransmitterNoBind(); diff --git a/sdrbase/audio/audiodeviceinfo.h b/sdrbase/audio/audiodeviceinfo.h index 38bce5596..02938b674 100644 --- a/sdrbase/audio/audiodeviceinfo.h +++ b/sdrbase/audio/audiodeviceinfo.h @@ -24,7 +24,7 @@ #include "util/export.h" -class SDRANGEL_API AudioDeviceInfo { +class SDRBASE_API AudioDeviceInfo { public: AudioDeviceInfo(); diff --git a/sdrbase/audio/audiofifo.h b/sdrbase/audio/audiofifo.h index 71859ef53..0fc452299 100644 --- a/sdrbase/audio/audiofifo.h +++ b/sdrbase/audio/audiofifo.h @@ -26,7 +26,7 @@ #include "util/export.h" #include "util/udpsink.h" -class SDRANGEL_API AudioFifo : public QObject { +class SDRBASE_API AudioFifo : public QObject { Q_OBJECT public: AudioFifo(); diff --git a/sdrbase/audio/audioinput.h b/sdrbase/audio/audioinput.h index 645143a0f..6e3cc56b5 100644 --- a/sdrbase/audio/audioinput.h +++ b/sdrbase/audio/audioinput.h @@ -29,7 +29,7 @@ class AudioFifo; class AudioOutputPipe; -class SDRANGEL_API AudioInput : public QIODevice { +class SDRBASE_API AudioInput : public QIODevice { public: AudioInput(); virtual ~AudioInput(); diff --git a/sdrbase/audio/audionetsink.h b/sdrbase/audio/audionetsink.h index 08dc27618..750aaf404 100644 --- a/sdrbase/audio/audionetsink.h +++ b/sdrbase/audio/audionetsink.h @@ -25,7 +25,7 @@ template class UDPSink; class RTPSink; -class SDRANGEL_API AudioNetSink { +class SDRBASE_API AudioNetSink { public: typedef enum { diff --git a/sdrbase/audio/audiooutput.h b/sdrbase/audio/audiooutput.h index a6d5b6ced..4fd1dade4 100644 --- a/sdrbase/audio/audiooutput.h +++ b/sdrbase/audio/audiooutput.h @@ -29,7 +29,7 @@ class QAudioOutput; class AudioFifo; class AudioOutputPipe; -class SDRANGEL_API AudioOutput : QIODevice { +class SDRBASE_API AudioOutput : QIODevice { public: AudioOutput(); virtual ~AudioOutput(); diff --git a/sdrbase/channel/channelsinkapi.h b/sdrbase/channel/channelsinkapi.h index dba578bf9..a2c2f9b1b 100644 --- a/sdrbase/channel/channelsinkapi.h +++ b/sdrbase/channel/channelsinkapi.h @@ -30,7 +30,7 @@ namespace SWGSDRangel class SWGChannelSettings; } -class SDRANGEL_API ChannelSinkAPI { +class SDRBASE_API ChannelSinkAPI { public: ChannelSinkAPI(const QString& name); virtual ~ChannelSinkAPI() {} diff --git a/sdrbase/channel/channelsourceapi.h b/sdrbase/channel/channelsourceapi.h index 192ee239f..18734b8f1 100644 --- a/sdrbase/channel/channelsourceapi.h +++ b/sdrbase/channel/channelsourceapi.h @@ -29,7 +29,7 @@ namespace SWGSDRangel class SWGChannelSettings; } -class SDRANGEL_API ChannelSourceAPI { +class SDRBASE_API ChannelSourceAPI { public: ChannelSourceAPI(const QString& name); virtual ~ChannelSourceAPI() {} diff --git a/sdrbase/commands/command.h b/sdrbase/commands/command.h index 172ac0d31..491f89df6 100644 --- a/sdrbase/commands/command.h +++ b/sdrbase/commands/command.h @@ -25,7 +25,9 @@ #include #include -class Command : public QObject +#include "util/export.h" + +class SDRBASE_API Command : public QObject { Q_OBJECT public: diff --git a/sdrbase/device/deviceenumerator.h b/sdrbase/device/deviceenumerator.h index 92938d5ac..b599dcb61 100644 --- a/sdrbase/device/deviceenumerator.h +++ b/sdrbase/device/deviceenumerator.h @@ -20,10 +20,11 @@ #include #include "plugin/plugininterface.h" +#include "util/export.h" class PluginManager; -class DeviceEnumerator +class SDRBASE_API DeviceEnumerator { public: DeviceEnumerator(); diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 7566aeef7..19434b824 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -33,7 +33,7 @@ class Preset; class DeviceSourceAPI; class ChannelSourceAPI; -class SDRANGEL_API DeviceSinkAPI : public QObject { +class SDRBASE_API DeviceSinkAPI : public QObject { Q_OBJECT public: diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h index 828506a9e..f8dd69ea3 100644 --- a/sdrbase/device/devicesourceapi.h +++ b/sdrbase/device/devicesourceapi.h @@ -35,7 +35,7 @@ class Preset; class DeviceSinkAPI; class ChannelSinkAPI; -class SDRANGEL_API DeviceSourceAPI : public QObject { +class SDRBASE_API DeviceSourceAPI : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/afsquelch.h b/sdrbase/dsp/afsquelch.h index d3e66447c..72bca12c4 100644 --- a/sdrbase/dsp/afsquelch.h +++ b/sdrbase/dsp/afsquelch.h @@ -19,11 +19,12 @@ #include "dsp/dsptypes.h" #include "dsp/movingaverage.h" +#include "util/export.h" /** AFSquelch: AF squelch class based on the Modified Goertzel * algorithm. */ -class AFSquelch { +class SDRBASE_API AFSquelch { public: // allows user defined tone pair AFSquelch(unsigned int nbTones, diff --git a/sdrbase/dsp/agc.h b/sdrbase/dsp/agc.h index 1c107bd88..2f7a3d71d 100644 --- a/sdrbase/dsp/agc.h +++ b/sdrbase/dsp/agc.h @@ -10,8 +10,9 @@ #include "movingaverage.h" #include "util/movingaverage.h" +#include "util/export.h" -class AGC +class SDRBASE_API AGC { public: AGC(int historySize, double R); @@ -32,7 +33,7 @@ protected: }; -class MagAGC : public AGC +class SDRBASE_API MagAGC : public AGC { public: MagAGC(int historySize, double R, double threshold); diff --git a/sdrbase/dsp/basebandsamplesink.h b/sdrbase/dsp/basebandsamplesink.h index 9897d280f..462d0ec04 100644 --- a/sdrbase/dsp/basebandsamplesink.h +++ b/sdrbase/dsp/basebandsamplesink.h @@ -25,7 +25,7 @@ class Message; -class SDRANGEL_API BasebandSampleSink : public QObject { +class SDRBASE_API BasebandSampleSink : public QObject { Q_OBJECT public: BasebandSampleSink(); diff --git a/sdrbase/dsp/basebandsamplesource.h b/sdrbase/dsp/basebandsamplesource.h index 4daac5840..a5b2e595c 100644 --- a/sdrbase/dsp/basebandsamplesource.h +++ b/sdrbase/dsp/basebandsamplesource.h @@ -26,7 +26,7 @@ class Message; -class SDRANGEL_API BasebandSampleSource : public QObject { +class SDRBASE_API BasebandSampleSource : public QObject { Q_OBJECT public: BasebandSampleSource(); diff --git a/sdrbase/dsp/channelmarker.h b/sdrbase/dsp/channelmarker.h index 30befb315..87bcb45e1 100644 --- a/sdrbase/dsp/channelmarker.h +++ b/sdrbase/dsp/channelmarker.h @@ -8,7 +8,7 @@ #include "settings/serializable.h" #include "util/export.h" -class SDRANGEL_API ChannelMarker : public QObject, public Serializable { +class SDRBASE_API ChannelMarker : public QObject, public Serializable { Q_OBJECT public: diff --git a/sdrbase/dsp/ctcssdetector.h b/sdrbase/dsp/ctcssdetector.h index e3799c07c..6f2fada0e 100644 --- a/sdrbase/dsp/ctcssdetector.h +++ b/sdrbase/dsp/ctcssdetector.h @@ -10,12 +10,13 @@ #define INCLUDE_GPL_DSP_CTCSSDETECTOR_H_ #include "dsp/dsptypes.h" +#include "util/export.h" /** CTCSSDetector: Continuous Tone Coded Squelch System * tone detector class based on the Modified Goertzel * algorithm. */ -class CTCSSDetector { +class SDRBASE_API CTCSSDetector { public: // Constructors and Destructor CTCSSDetector(); diff --git a/sdrbase/dsp/cwkeyer.h b/sdrbase/dsp/cwkeyer.h index 445da213b..35e2399ab 100644 --- a/sdrbase/dsp/cwkeyer.h +++ b/sdrbase/dsp/cwkeyer.h @@ -28,7 +28,7 @@ /** * Ancillary class to smooth out CW transitions with a sine shape */ -class CWSmoother +class SDRBASE_API CWSmoother { public: CWSmoother(); @@ -46,7 +46,7 @@ private: float *m_fadeOutSamples; }; -class SDRANGEL_API CWKeyer : public QObject { +class SDRBASE_API CWKeyer : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/cwkeyersettings.h b/sdrbase/dsp/cwkeyersettings.h index ec3c5c489..d4a4d9d4a 100644 --- a/sdrbase/dsp/cwkeyersettings.h +++ b/sdrbase/dsp/cwkeyersettings.h @@ -21,7 +21,9 @@ #include #include -class CWKeyerSettings +#include "util/export.h" + +class SDRBASE_API CWKeyerSettings { public: typedef enum diff --git a/sdrbase/dsp/decimatorsf.h b/sdrbase/dsp/decimatorsf.h index 3c631ee1e..751f39815 100644 --- a/sdrbase/dsp/decimatorsf.h +++ b/sdrbase/dsp/decimatorsf.h @@ -18,10 +18,11 @@ #define SDRBASE_DSP_DECIMATORSF_H_ #include "dsp/inthalfbandfilterdbf.h" +#include "util/export.h" #define DECIMATORSF_HB_FILTER_ORDER 64 -class DecimatorsF +class SDRBASE_API DecimatorsF { public: void decimate1(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); diff --git a/sdrbase/dsp/devicesamplesink.h b/sdrbase/dsp/devicesamplesink.h index e49b441f3..5171f06ef 100644 --- a/sdrbase/dsp/devicesamplesink.h +++ b/sdrbase/dsp/devicesamplesink.h @@ -31,7 +31,7 @@ namespace SWGSDRangel class SWGDeviceState; } -class SDRANGEL_API DeviceSampleSink : public QObject { +class SDRBASE_API DeviceSampleSink : public QObject { Q_OBJECT public: DeviceSampleSink(); diff --git a/sdrbase/dsp/devicesamplesource.h b/sdrbase/dsp/devicesamplesource.h index dbc570b20..909c74a4b 100644 --- a/sdrbase/dsp/devicesamplesource.h +++ b/sdrbase/dsp/devicesamplesource.h @@ -32,7 +32,7 @@ namespace SWGSDRangel class SWGDeviceState; } -class SDRANGEL_API DeviceSampleSource : public QObject { +class SDRBASE_API DeviceSampleSource : public QObject { Q_OBJECT public: DeviceSampleSource(); diff --git a/sdrbase/dsp/downchannelizer.h b/sdrbase/dsp/downchannelizer.h index f95678c08..d41b94677 100644 --- a/sdrbase/dsp/downchannelizer.h +++ b/sdrbase/dsp/downchannelizer.h @@ -37,7 +37,7 @@ class MessageQueue; -class SDRANGEL_API DownChannelizer : public BasebandSampleSink { +class SDRBASE_API DownChannelizer : public BasebandSampleSink { Q_OBJECT public: class SDRANGEL_API MsgChannelizerNotification : public Message { diff --git a/sdrbase/dsp/dspcommands.h b/sdrbase/dsp/dspcommands.h index 7ba24a242..49199098b 100644 --- a/sdrbase/dsp/dspcommands.h +++ b/sdrbase/dsp/dspcommands.h @@ -31,31 +31,31 @@ class BasebandSampleSource; class ThreadedBasebandSampleSource; class AudioFifo; -class SDRANGEL_API DSPAcquisitionInit : public Message { +class SDRBASE_API DSPAcquisitionInit : public Message { MESSAGE_CLASS_DECLARATION }; -class SDRANGEL_API DSPAcquisitionStart : public Message { +class SDRBASE_API DSPAcquisitionStart : public Message { MESSAGE_CLASS_DECLARATION }; -class SDRANGEL_API DSPAcquisitionStop : public Message { +class SDRBASE_API DSPAcquisitionStop : public Message { MESSAGE_CLASS_DECLARATION }; -class SDRANGEL_API DSPGenerationInit : public Message { +class SDRBASE_API DSPGenerationInit : public Message { MESSAGE_CLASS_DECLARATION }; -class SDRANGEL_API DSPGenerationStart : public Message { +class SDRBASE_API DSPGenerationStart : public Message { MESSAGE_CLASS_DECLARATION }; -class SDRANGEL_API DSPGenerationStop : public Message { +class SDRBASE_API DSPGenerationStop : public Message { MESSAGE_CLASS_DECLARATION }; -class SDRANGEL_API DSPGetSourceDeviceDescription : public Message { +class SDRBASE_API DSPGetSourceDeviceDescription : public Message { MESSAGE_CLASS_DECLARATION public: @@ -66,7 +66,7 @@ private: QString m_deviceDescription; }; -class SDRANGEL_API DSPGetSinkDeviceDescription : public Message { +class SDRBASE_API DSPGetSinkDeviceDescription : public Message { MESSAGE_CLASS_DECLARATION public: @@ -77,7 +77,7 @@ private: QString m_deviceDescription; }; -class SDRANGEL_API DSPGetErrorMessage : public Message { +class SDRBASE_API DSPGetErrorMessage : public Message { MESSAGE_CLASS_DECLARATION public: @@ -88,7 +88,7 @@ private: QString m_errorMessage; }; -class SDRANGEL_API DSPSetSource : public Message { +class SDRBASE_API DSPSetSource : public Message { MESSAGE_CLASS_DECLARATION public: @@ -100,7 +100,7 @@ private: DeviceSampleSource* m_sampleSource; }; -class SDRANGEL_API DSPSetSink : public Message { +class SDRBASE_API DSPSetSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -112,7 +112,7 @@ private: DeviceSampleSink* m_sampleSink; }; -class SDRANGEL_API DSPAddBasebandSampleSink : public Message { +class SDRBASE_API DSPAddBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -124,7 +124,7 @@ private: BasebandSampleSink* m_sampleSink; }; -class SDRANGEL_API DSPAddSpectrumSink : public Message { +class SDRBASE_API DSPAddSpectrumSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -136,7 +136,7 @@ private: BasebandSampleSink* m_sampleSink; }; -class SDRANGEL_API DSPAddBasebandSampleSource : public Message { +class SDRBASE_API DSPAddBasebandSampleSource : public Message { MESSAGE_CLASS_DECLARATION public: @@ -148,7 +148,7 @@ private: BasebandSampleSource* m_sampleSource; }; -class SDRANGEL_API DSPRemoveBasebandSampleSink : public Message { +class SDRBASE_API DSPRemoveBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -160,7 +160,7 @@ private: BasebandSampleSink* m_sampleSink; }; -class SDRANGEL_API DSPRemoveSpectrumSink : public Message { +class SDRBASE_API DSPRemoveSpectrumSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -172,7 +172,7 @@ private: BasebandSampleSink* m_sampleSink; }; -class SDRANGEL_API DSPRemoveBasebandSampleSource : public Message { +class SDRBASE_API DSPRemoveBasebandSampleSource : public Message { MESSAGE_CLASS_DECLARATION public: @@ -184,7 +184,7 @@ private: BasebandSampleSource* m_sampleSource; }; -class SDRANGEL_API DSPAddThreadedBasebandSampleSink : public Message { +class SDRBASE_API DSPAddThreadedBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -196,7 +196,7 @@ private: ThreadedBasebandSampleSink* m_threadedSampleSink; }; -class SDRANGEL_API DSPAddThreadedBasebandSampleSource : public Message { +class SDRBASE_API DSPAddThreadedBasebandSampleSource : public Message { MESSAGE_CLASS_DECLARATION public: @@ -208,7 +208,7 @@ private: ThreadedBasebandSampleSource* m_threadedSampleSource; }; -class SDRANGEL_API DSPRemoveThreadedBasebandSampleSink : public Message { +class SDRBASE_API DSPRemoveThreadedBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -220,7 +220,7 @@ private: ThreadedBasebandSampleSink* m_threadedSampleSink; }; -class SDRANGEL_API DSPRemoveThreadedBasebandSampleSource : public Message { +class SDRBASE_API DSPRemoveThreadedBasebandSampleSource : public Message { MESSAGE_CLASS_DECLARATION public: @@ -232,7 +232,7 @@ private: ThreadedBasebandSampleSource* m_threadedSampleSource; }; -class SDRANGEL_API DSPAddAudioSink : public Message { +class SDRBASE_API DSPAddAudioSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -244,7 +244,7 @@ private: AudioFifo* m_audioFifo; }; -class SDRANGEL_API DSPRemoveAudioSink : public Message { +class SDRBASE_API DSPRemoveAudioSink : public Message { MESSAGE_CLASS_DECLARATION public: @@ -256,7 +256,7 @@ private: AudioFifo* m_audioFifo; }; -class SDRANGEL_API DSPConfigureSpectrumVis : public Message { +class SDRBASE_API DSPConfigureSpectrumVis : public Message { MESSAGE_CLASS_DECLARATION public: @@ -277,7 +277,7 @@ private: FFTWindow::Function m_window; }; -class SDRANGEL_API DSPConfigureCorrection : public Message { +class SDRBASE_API DSPConfigureCorrection : public Message { MESSAGE_CLASS_DECLARATION public: @@ -296,7 +296,7 @@ private: }; -class SDRANGEL_API DSPEngineReport : public Message { +class SDRBASE_API DSPEngineReport : public Message { MESSAGE_CLASS_DECLARATION public: @@ -314,7 +314,7 @@ private: quint64 m_centerFrequency; }; -class SDRANGEL_API DSPConfigureScopeVis : public Message { +class SDRBASE_API DSPConfigureScopeVis : public Message { MESSAGE_CLASS_DECLARATION public: @@ -335,7 +335,7 @@ private: Real m_triggerLevelLow; }; -class SDRANGEL_API DSPSignalNotification : public Message { +class SDRBASE_API DSPSignalNotification : public Message { MESSAGE_CLASS_DECLARATION public: @@ -353,7 +353,7 @@ private: qint64 m_centerFrequency; }; -class SDRANGEL_API DSPConfigureChannelizer : public Message { +class SDRBASE_API DSPConfigureChannelizer : public Message { MESSAGE_CLASS_DECLARATION public: diff --git a/sdrbase/dsp/dspdevicesinkengine.h b/sdrbase/dsp/dspdevicesinkengine.h index db4553dda..f148df672 100644 --- a/sdrbase/dsp/dspdevicesinkengine.h +++ b/sdrbase/dsp/dspdevicesinkengine.h @@ -36,7 +36,7 @@ class BasebandSampleSource; class ThreadedBasebandSampleSource; class BasebandSampleSink; -class SDRANGEL_API DSPDeviceSinkEngine : public QThread { +class SDRBASE_API DSPDeviceSinkEngine : public QThread { Q_OBJECT public: diff --git a/sdrbase/dsp/dspdevicesourceengine.h b/sdrbase/dsp/dspdevicesourceengine.h index 923c0715e..a71a3ebbc 100644 --- a/sdrbase/dsp/dspdevicesourceengine.h +++ b/sdrbase/dsp/dspdevicesourceengine.h @@ -33,7 +33,7 @@ class DeviceSampleSource; class BasebandSampleSink; class ThreadedBasebandSampleSink; -class SDRANGEL_API DSPDeviceSourceEngine : public QThread { +class SDRBASE_API DSPDeviceSourceEngine : public QThread { Q_OBJECT public: diff --git a/sdrbase/dsp/dspengine.h b/sdrbase/dsp/dspengine.h index 7f8bac5b1..43fe1bf28 100644 --- a/sdrbase/dsp/dspengine.h +++ b/sdrbase/dsp/dspengine.h @@ -32,7 +32,7 @@ class DSPDeviceSourceEngine; class DSPDeviceSinkEngine; -class SDRANGEL_API DSPEngine : public QObject { +class SDRBASE_API DSPEngine : public QObject { Q_OBJECT public: DSPEngine(); diff --git a/sdrbase/dsp/dvserialengine.h b/sdrbase/dsp/dvserialengine.h index f2248f90e..b5c50af09 100644 --- a/sdrbase/dsp/dvserialengine.h +++ b/sdrbase/dsp/dvserialengine.h @@ -24,11 +24,13 @@ #include #include +#include "util/export.h" + class QThread; class DVSerialWorker; class AudioFifo; -class DVSerialEngine : public QObject +class SDRBASE_API DVSerialEngine : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/dvserialworker.h b/sdrbase/dsp/dvserialworker.h index 52af0acdb..72dac23ad 100644 --- a/sdrbase/dsp/dvserialworker.h +++ b/sdrbase/dsp/dvserialworker.h @@ -29,12 +29,13 @@ #include "util/message.h" #include "util/syncmessenger.h" #include "util/messagequeue.h" +#include "util/export.h" #include "dsp/filtermbe.h" #include "dsp/dsptypes.h" class AudioFifo; -class DVSerialWorker : public QObject { +class SDRBASE_API DVSerialWorker : public QObject { Q_OBJECT public: class MsgTest : public Message diff --git a/sdrbase/dsp/fftengine.h b/sdrbase/dsp/fftengine.h index 05665241a..abae57959 100644 --- a/sdrbase/dsp/fftengine.h +++ b/sdrbase/dsp/fftengine.h @@ -4,7 +4,7 @@ #include "dsp/dsptypes.h" #include "util/export.h" -class SDRANGEL_API FFTEngine { +class SDRBASE_API FFTEngine { public: virtual ~FFTEngine(); diff --git a/sdrbase/dsp/fftfilt.h b/sdrbase/dsp/fftfilt.h index 6318cf2d5..2feabd9ce 100644 --- a/sdrbase/dsp/fftfilt.h +++ b/sdrbase/dsp/fftfilt.h @@ -7,13 +7,14 @@ #include #include "gfft.h" +#include "util/export.h" #undef M_PI #define M_PI 3.14159265358979323846 //---------------------------------------------------------------------- -class fftfilt { +class SDRBASE_API fftfilt { enum {NONE, BLACKMAN, HAMMING, HANNING}; public: @@ -66,7 +67,7 @@ protected: /* Sliding FFT filter from Fldigi */ -class sfft { +class SDRBASE_API sfft { #define K1 0.99999 public: typedef std::complex cmplx; diff --git a/sdrbase/dsp/fftwengine.h b/sdrbase/dsp/fftwengine.h index 9224ba4ad..6000a7a7a 100644 --- a/sdrbase/dsp/fftwengine.h +++ b/sdrbase/dsp/fftwengine.h @@ -5,8 +5,9 @@ #include #include #include "dsp/fftengine.h" +#include "util/export.h" -class FFTWEngine : public FFTEngine { +class SDRBASE_API FFTWEngine : public FFTEngine { public: FFTWEngine(); ~FFTWEngine(); diff --git a/sdrbase/dsp/fftwindow.h b/sdrbase/dsp/fftwindow.h index cca317810..cad15d052 100644 --- a/sdrbase/dsp/fftwindow.h +++ b/sdrbase/dsp/fftwindow.h @@ -27,7 +27,7 @@ #undef M_PI #define M_PI 3.14159265358979323846 -class SDRANGEL_API FFTWindow { +class SDRBASE_API FFTWindow { public: enum Function { Bartlett, diff --git a/sdrbase/dsp/filerecord.h b/sdrbase/dsp/filerecord.h index dac0be078..ccb531a02 100644 --- a/sdrbase/dsp/filerecord.h +++ b/sdrbase/dsp/filerecord.h @@ -11,7 +11,7 @@ class Message; -class SDRANGEL_API FileRecord : public BasebandSampleSink { +class SDRBASE_API FileRecord : public BasebandSampleSink { public: struct Header diff --git a/sdrbase/dsp/filtermbe.h b/sdrbase/dsp/filtermbe.h index f3d6788fb..9163e8523 100644 --- a/sdrbase/dsp/filtermbe.h +++ b/sdrbase/dsp/filtermbe.h @@ -58,8 +58,9 @@ */ #include "iirfilter.h" +#include "util/export.h" -class MBEAudioInterpolatorFilter +class SDRBASE_API MBEAudioInterpolatorFilter { public: MBEAudioInterpolatorFilter(); diff --git a/sdrbase/dsp/filterrc.h b/sdrbase/dsp/filterrc.h index 7f1af7c89..09da1cd64 100644 --- a/sdrbase/dsp/filterrc.h +++ b/sdrbase/dsp/filterrc.h @@ -19,9 +19,10 @@ #define INCLUDE_DSP_FILTERRC_H_ #include "dsp/dsptypes.h" +#include "util/export.h" /** First order low-pass IIR filter for real-valued signals. */ -class LowPassFilterRC +class SDRBASE_API LowPassFilterRC { public: diff --git a/sdrbase/dsp/hbfiltertraits.h b/sdrbase/dsp/hbfiltertraits.h index f72e46765..8d1848944 100644 --- a/sdrbase/dsp/hbfiltertraits.h +++ b/sdrbase/dsp/hbfiltertraits.h @@ -19,6 +19,7 @@ #define SDRBASE_DSP_HBFILTERTRAITS_H_ #include +#include "util/export.h" // uses Q1.14 format internally, input and output are S16 @@ -32,7 +33,7 @@ struct HBFIRFilterTraits }; template<> -struct HBFIRFilterTraits<16> +struct SDRBASE_API HBFIRFilterTraits<16> { static const int32_t hbOrder = 16; static const int32_t hbShift = 12; @@ -42,7 +43,7 @@ struct HBFIRFilterTraits<16> }; template<> -struct HBFIRFilterTraits<32> +struct SDRBASE_API HBFIRFilterTraits<32> { static const int32_t hbOrder = 32; static const int32_t hbShift = 12; @@ -52,7 +53,7 @@ struct HBFIRFilterTraits<32> }; template<> -struct HBFIRFilterTraits<48> +struct SDRBASE_API HBFIRFilterTraits<48> { static const int32_t hbOrder = 48; static const int32_t hbShift = 12; @@ -62,7 +63,7 @@ struct HBFIRFilterTraits<48> }; template<> -struct HBFIRFilterTraits<64> +struct SDRBASE_API HBFIRFilterTraits<64> { static const int32_t hbOrder = 64; static const int32_t hbShift = 12; @@ -72,7 +73,7 @@ struct HBFIRFilterTraits<64> }; template<> -struct HBFIRFilterTraits<80> +struct SDRBASE_API HBFIRFilterTraits<80> { static const int32_t hbOrder = 80; static const int32_t hbShift = 14; @@ -82,7 +83,7 @@ struct HBFIRFilterTraits<80> }; template<> -struct HBFIRFilterTraits<96> +struct SDRBASE_API HBFIRFilterTraits<96> { static const int32_t hbOrder = 96; static const int32_t hbShift = 16; @@ -92,7 +93,7 @@ struct HBFIRFilterTraits<96> }; template<> -struct HBFIRFilterTraits<112> +struct SDRBASE_API HBFIRFilterTraits<112> { static const int32_t hbOrder = 112; static const int32_t hbShift = 18; @@ -102,7 +103,7 @@ struct HBFIRFilterTraits<112> }; template<> -struct HBFIRFilterTraits<128> +struct SDRBASE_API HBFIRFilterTraits<128> { static const int32_t hbOrder = 128; static const int32_t hbShift = 20; diff --git a/sdrbase/dsp/interpolator.h b/sdrbase/dsp/interpolator.h index b504987af..11a979e48 100644 --- a/sdrbase/dsp/interpolator.h +++ b/sdrbase/dsp/interpolator.h @@ -11,7 +11,7 @@ #include #endif -class SDRANGEL_API Interpolator { +class SDRBASE_API Interpolator { public: Interpolator(); ~Interpolator(); diff --git a/sdrbase/dsp/kissengine.h b/sdrbase/dsp/kissengine.h index ad8e53c32..83d029745 100644 --- a/sdrbase/dsp/kissengine.h +++ b/sdrbase/dsp/kissengine.h @@ -3,8 +3,9 @@ #include "dsp/fftengine.h" #include "dsp/kissfft.h" +#include "util/export.h" -class KissEngine : public FFTEngine { +class SDRBASE_API KissEngine : public FFTEngine { public: void configure(int n, bool inverse); void transform(); diff --git a/sdrbase/dsp/nco.h b/sdrbase/dsp/nco.h index 58739fcbc..735a7f70a 100644 --- a/sdrbase/dsp/nco.h +++ b/sdrbase/dsp/nco.h @@ -21,7 +21,7 @@ #include "dsp/dsptypes.h" #include "util/export.h" -class SDRANGEL_API NCO { +class SDRBASE_API NCO { private: enum { TableSize = (1 << 12), diff --git a/sdrbase/dsp/ncof.h b/sdrbase/dsp/ncof.h index 57fa4258f..d07064e56 100644 --- a/sdrbase/dsp/ncof.h +++ b/sdrbase/dsp/ncof.h @@ -20,7 +20,7 @@ #include "dsp/dsptypes.h" #include "util/export.h" -class SDRANGEL_API NCOF { +class SDRBASE_API NCOF { private: enum { TableSize = (1 << 12), diff --git a/sdrbase/dsp/nullsink.h b/sdrbase/dsp/nullsink.h index f9c75447c..0bdbe76a2 100644 --- a/sdrbase/dsp/nullsink.h +++ b/sdrbase/dsp/nullsink.h @@ -6,7 +6,7 @@ class Message; -class SDRANGEL_API NullSink : public BasebandSampleSink { +class SDRBASE_API NullSink : public BasebandSampleSink { public: NullSink(); diff --git a/sdrbase/dsp/phaselock.h b/sdrbase/dsp/phaselock.h index 8547a4f82..47e0ba692 100644 --- a/sdrbase/dsp/phaselock.h +++ b/sdrbase/dsp/phaselock.h @@ -17,9 +17,10 @@ #include #include "dsp/dsptypes.h" +#include "util/export.h" /** Phase-locked loop mainly for broadcadt FM stereo pilot. */ -class PhaseLock +class SDRBASE_API PhaseLock { public: diff --git a/sdrbase/dsp/recursivefilters.h b/sdrbase/dsp/recursivefilters.h index 26f6577f8..68f4b0448 100644 --- a/sdrbase/dsp/recursivefilters.h +++ b/sdrbase/dsp/recursivefilters.h @@ -17,11 +17,13 @@ #ifndef SDRBASE_DSP_RECURSIVEFILTERS_H_ #define SDRBASE_DSP_RECURSIVEFILTERS_H_ +#include "util/export.h" + /** * \Brief: This is a second order bandpass filter using recursive method. r is in range ]0..1[ the higher the steeper the filter. * inspired by:http://www.ece.umd.edu/~tretter/commlab/c6713slides/FSKSlides.pdf */ -class SecondOrderRecursiveFilter +class SDRBASE_API SecondOrderRecursiveFilter { public: SecondOrderRecursiveFilter(float samplingFrequency, float centerFrequency, float r); diff --git a/sdrbase/dsp/samplesinkfifo.h b/sdrbase/dsp/samplesinkfifo.h index 35fcc027c..cdead7be5 100644 --- a/sdrbase/dsp/samplesinkfifo.h +++ b/sdrbase/dsp/samplesinkfifo.h @@ -24,7 +24,7 @@ #include "dsp/dsptypes.h" #include "util/export.h" -class SDRANGEL_API SampleSinkFifo : public QObject { +class SDRBASE_API SampleSinkFifo : public QObject { Q_OBJECT private: diff --git a/sdrbase/dsp/samplesinkfifodoublebuffered.h b/sdrbase/dsp/samplesinkfifodoublebuffered.h index 74befb05d..d7421e512 100644 --- a/sdrbase/dsp/samplesinkfifodoublebuffered.h +++ b/sdrbase/dsp/samplesinkfifodoublebuffered.h @@ -24,7 +24,7 @@ #include "util/export.h" #include "dsp/dsptypes.h" -class SDRANGEL_API SampleSinkFifoDoubleBuffered : public QObject { +class SDRBASE_API SampleSinkFifoDoubleBuffered : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/samplesourcefifo.h b/sdrbase/dsp/samplesourcefifo.h index f42f9c6b5..0f4f2e108 100644 --- a/sdrbase/dsp/samplesourcefifo.h +++ b/sdrbase/dsp/samplesourcefifo.h @@ -24,7 +24,7 @@ #include "util/export.h" #include "dsp/dsptypes.h" -class SDRANGEL_API SampleSourceFifo : public QObject { +class SDRBASE_API SampleSourceFifo : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/threadedbasebandsamplesink.h b/sdrbase/dsp/threadedbasebandsamplesink.h index 93368c6bb..9c9a9fe1a 100644 --- a/sdrbase/dsp/threadedbasebandsamplesink.h +++ b/sdrbase/dsp/threadedbasebandsamplesink.h @@ -32,7 +32,7 @@ class QThread; * Because Qt is a piece of shit this class cannot be a nested protected class of ThreadedSampleSink * So let's make everything public */ -class ThreadedBasebandSampleSinkFifo : public QObject { +class SDRBASE_API ThreadedBasebandSampleSinkFifo : public QObject { Q_OBJECT public: @@ -50,7 +50,7 @@ public slots: /** * This class is a wrapper for SampleSink that runs the SampleSink object in its own thread */ -class SDRANGEL_API ThreadedBasebandSampleSink : public QObject { +class SDRBASE_API ThreadedBasebandSampleSink : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/threadedbasebandsamplesource.h b/sdrbase/dsp/threadedbasebandsamplesource.h index defb1cfb5..e22673c97 100644 --- a/sdrbase/dsp/threadedbasebandsamplesource.h +++ b/sdrbase/dsp/threadedbasebandsamplesource.h @@ -30,7 +30,7 @@ class QThread; /** * This class is a wrapper for BasebandSampleSource that runs the BasebandSampleSource object in its own thread */ -class SDRANGEL_API ThreadedBasebandSampleSource : public QObject { +class SDRBASE_API ThreadedBasebandSampleSource : public QObject { Q_OBJECT public: diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h index 3b15f7a96..644155699 100644 --- a/sdrbase/dsp/upchannelizer.h +++ b/sdrbase/dsp/upchannelizer.h @@ -33,7 +33,7 @@ class MessageQueue; -class SDRANGEL_API UpChannelizer : public BasebandSampleSource { +class SDRBASE_API UpChannelizer : public BasebandSampleSource { Q_OBJECT public: class SDRANGEL_API MsgChannelizerNotification : public Message { diff --git a/sdrbase/dsp/wfir.h b/sdrbase/dsp/wfir.h index 981f80a24..d01a46893 100644 --- a/sdrbase/dsp/wfir.h +++ b/sdrbase/dsp/wfir.h @@ -53,7 +53,9 @@ #ifndef _WFIR_H_ #define _WFIR_H_ -class WFIR +#include "util/export.h" + +class SDRBASE_API WFIR { public: enum TPassTypeName diff --git a/sdrbase/mainparser.h b/sdrbase/mainparser.h index 3d0c19765..0112d3079 100644 --- a/sdrbase/mainparser.h +++ b/sdrbase/mainparser.h @@ -21,7 +21,9 @@ #include #include -class MainParser +#include "util/export.h" + +class SDRBASE_API MainParser { public: MainParser(); diff --git a/sdrbase/plugin/pluginapi.h b/sdrbase/plugin/pluginapi.h index ed7a5ad59..6e72ca989 100644 --- a/sdrbase/plugin/pluginapi.h +++ b/sdrbase/plugin/pluginapi.h @@ -13,7 +13,7 @@ class PluginManager; class MessageQueue; class PluginInstanceGUI; -class SDRANGEL_API PluginAPI : public QObject { +class SDRBASE_API PluginAPI : public QObject { Q_OBJECT public: diff --git a/sdrbase/plugin/plugininstancegui.h b/sdrbase/plugin/plugininstancegui.h index 8871c1ec4..af8ccc59f 100644 --- a/sdrbase/plugin/plugininstancegui.h +++ b/sdrbase/plugin/plugininstancegui.h @@ -10,7 +10,7 @@ class Message; class MessageQueue; -class SDRANGEL_API PluginInstanceGUI { +class SDRBASE_API PluginInstanceGUI { public: PluginInstanceGUI() { }; virtual ~PluginInstanceGUI() { }; diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index fdcaccda6..57dec2139 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -4,7 +4,9 @@ #include #include -struct PluginDescriptor { +#include "util/export.h" + +struct SDRBASE_API PluginDescriptor { // general plugin description const QString displayedName; const QString version; @@ -27,7 +29,7 @@ class BasebandSampleSource; class ChannelSinkAPI; class ChannelSourceAPI; -class PluginInterface { +class SDRBASE_API PluginInterface { public: struct SamplingDevice { diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 442a21719..e202f5856 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -19,7 +19,7 @@ class MessageQueue; class DeviceSourceAPI; class DeviceSinkAPI; -class SDRANGEL_API PluginManager : public QObject { +class SDRBASE_API PluginManager : public QObject { Q_OBJECT public: diff --git a/sdrbase/settings/mainsettings.h b/sdrbase/settings/mainsettings.h index d200b8865..8734d81f5 100644 --- a/sdrbase/settings/mainsettings.h +++ b/sdrbase/settings/mainsettings.h @@ -5,10 +5,11 @@ #include "preferences.h" #include "preset.h" #include "audio/audiodeviceinfo.h" +#include "util/export.h" class Command; -class MainSettings { +class SDRBASE_API MainSettings { public: MainSettings(); ~MainSettings(); diff --git a/sdrbase/settings/preferences.h b/sdrbase/settings/preferences.h index c58723447..ef7461ddb 100644 --- a/sdrbase/settings/preferences.h +++ b/sdrbase/settings/preferences.h @@ -3,7 +3,9 @@ #include -class Preferences { +#include "util/export.h" + +class SDRBASE_API Preferences { public: Preferences(); diff --git a/sdrbase/settings/preset.h b/sdrbase/settings/preset.h index a2f07fb77..390fd63da 100644 --- a/sdrbase/settings/preset.h +++ b/sdrbase/settings/preset.h @@ -5,7 +5,9 @@ #include #include -class Preset { +#include "util/export.h" + +class SDRBASE_API Preset { public: struct ChannelConfig { QString m_channelIdURI; //!< Channel type ID in URI form diff --git a/sdrbase/util/CRC64.h b/sdrbase/util/CRC64.h index bede1df55..26924252a 100644 --- a/sdrbase/util/CRC64.h +++ b/sdrbase/util/CRC64.h @@ -19,7 +19,9 @@ #include -class CRC64 +#include "util/export.h" + +class SDRBASE_API CRC64 { public: CRC64(); diff --git a/sdrbase/util/db.h b/sdrbase/util/db.h index 5e6741cac..fb08bcc41 100644 --- a/sdrbase/util/db.h +++ b/sdrbase/util/db.h @@ -18,8 +18,9 @@ #define INCLUDE_UTIL_DB_H_ #include "dsp/dsptypes.h" +#include "util/export.h" -class CalcDb +class SDRBASE_API CalcDb { public: static double dbPower(double magsq, double floor = 1e-12); diff --git a/sdrbase/util/export.h b/sdrbase/util/export.h index 7c246d648..6332b9bf7 100644 --- a/sdrbase/util/export.h +++ b/sdrbase/util/export.h @@ -17,29 +17,91 @@ #ifndef __SDRANGEL_EXPORT_H #define __SDRANGEL_EXPORT_H -#if defined __GNUC__ -# if __GNUC__ >= 4 -# define __SDR_EXPORT __attribute__((visibility("default"))) -# define __SDR_IMPORT __attribute__((visibility("default"))) -# else -# define __SDR_EXPORT -# define __SDR_IMPORT -# endif -#elif _MSC_VER -# define __SDR_EXPORT __declspec(dllexport) -# define __SDR_IMPORT __declspec(dllimport) +#if defined (__GNUC__) && (__GNUC__ >= 4) +# define __SDR_EXPORT __attribute__((visibility("default"))) +# define __SDR_IMPORT __attribute__((visibility("default"))) + +#elif defined (_MSC_VER) +# define __SDR_EXPORT __declspec(dllexport) +# define __SDR_IMPORT __declspec(dllimport) + #else # define __SDR_EXPORT # define __SDR_IMPORT #endif -#ifndef sdrangel_STATIC -# ifdef sdrangel_EXPORTS -# define SDRANGEL_API __SDR_EXPORT -# else -# define SDRANGEL_API __SDR_IMPORT -# endif +/* The 'SDRBASE_API' controls the import/export of 'sdrbase' symbols and classes. + */ +#if !defined(sdrangel_STATIC) +# if defined sdrangel_EXPORTS || defined sdrbase_EXPORTS +# define SDRBASE_API __SDR_EXPORT +# else +# define SDRBASE_API __SDR_IMPORT +# endif #else -#define SDRANGEL_API +# define SDRBASE_API #endif + +#define SDRANGEL_API SDRBASE_API /* to be compatible with current situation TODO: remove */ + +/* the 'SDRGUI_API' controls the import/export of 'sdrgui' symbols + */ +#if !defined(sdrangel_STATIC) +# ifdef sdrgui_EXPORTS +# define SDRGUI_API __SDR_EXPORT +# else +# define SDRGUI_API __SDR_IMPORT +# endif +#else +# define SDRGUI_API +#endif + +/* the 'DEVICES_API' controls the import/export of 'devices' symbols + */ +#if !defined(sdrangel_STATIC) +# ifdef devices_EXPORTS +# define DEVICES_API __SDR_EXPORT +# else +# define DEVICES_API __SDR_IMPORT +# endif +#else +# define DEVICES_API +#endif + +/* the 'HTTPSERVER_API' controls the import/export of 'httpserver' symbols + */ +#if !defined(sdrangel_STATIC) +# ifdef httpserver_EXPORTS +# define HTTPSERVER_API __SDR_EXPORT +# else +# define HTTPSERVER_API __SDR_IMPORT +# endif +#else +# define HTTPSERVER_API +#endif + +/* the 'LOGGING_API' controls the import/export of 'logging' symbols + */ +#if !defined(sdrangel_STATIC) +# ifdef logging_EXPORTS +# define LOGGING_API __SDR_EXPORT +# else +# define LOGGING_API __SDR_IMPORT +# endif +#else +# define LOGGING_API +#endif + +/* the 'QRTPLIB_API' controls the import/export of 'qrtplib' symbols + */ +#if !defined(sdrangel_STATIC) +# ifdef qrtplib_EXPORTS +# define QRTPLIB_API __SDR_EXPORT +# else +# define QRTPLIB_API __SDR_IMPORT +# endif +#else +# define QRTPLIB_API +#endif + #endif /* __SDRANGEL_EXPORT_H */ diff --git a/sdrbase/util/fixedtraits.h b/sdrbase/util/fixedtraits.h index 7b7167031..85c1327d5 100644 --- a/sdrbase/util/fixedtraits.h +++ b/sdrbase/util/fixedtraits.h @@ -20,13 +20,15 @@ #include +#include "util/export.h" + template class FixedTraits { }; template<> -struct FixedTraits<28> +struct SDRBASE_API FixedTraits<28> { static const uint32_t fixed_resolution_shift = 28; //!< 1.0 representation. 28 is the highest power of two that can represent 9.99999... safely on 64 bits internally static const int64_t fixed_resolution = 1LL << fixed_resolution_shift; @@ -42,7 +44,7 @@ struct FixedTraits<28> }; template<> -struct FixedTraits<16> +struct SDRBASE_API FixedTraits<16> { static const uint32_t fixed_resolution_shift = 16; static const int64_t fixed_resolution = 1LL << fixed_resolution_shift; @@ -58,7 +60,7 @@ struct FixedTraits<16> }; template<> -struct FixedTraits<23> +struct SDRBASE_API FixedTraits<23> { static const uint32_t fixed_resolution_shift = 23; static const int64_t fixed_resolution = 1LL << fixed_resolution_shift; @@ -74,7 +76,7 @@ struct FixedTraits<23> }; template<> -struct FixedTraits<24> +struct SDRBASE_API FixedTraits<24> { static const uint32_t fixed_resolution_shift = 24; static const int64_t fixed_resolution = 1LL << fixed_resolution_shift; diff --git a/sdrbase/util/message.h b/sdrbase/util/message.h index 758368a68..bbdeca69a 100644 --- a/sdrbase/util/message.h +++ b/sdrbase/util/message.h @@ -21,7 +21,7 @@ #include #include "util/export.h" -class SDRANGEL_API Message { +class SDRBASE_API Message { public: Message(); virtual ~Message(); diff --git a/sdrbase/util/messagequeue.h b/sdrbase/util/messagequeue.h index 1e718978b..1301a13e6 100644 --- a/sdrbase/util/messagequeue.h +++ b/sdrbase/util/messagequeue.h @@ -25,7 +25,7 @@ class Message; -class SDRANGEL_API MessageQueue : public QObject { +class SDRBASE_API MessageQueue : public QObject { Q_OBJECT public: diff --git a/sdrbase/util/prettyprint.h b/sdrbase/util/prettyprint.h index f53839532..74002f86f 100644 --- a/sdrbase/util/prettyprint.h +++ b/sdrbase/util/prettyprint.h @@ -19,7 +19,9 @@ #include -class EscapeColors +#include "util/export.h" + +class SDRBASE_API EscapeColors { public: static const QString red; diff --git a/sdrbase/util/rtpsink.h b/sdrbase/util/rtpsink.h index 8daac0f74..28753f3c4 100644 --- a/sdrbase/util/rtpsink.h +++ b/sdrbase/util/rtpsink.h @@ -31,7 +31,9 @@ #include "rtperrors.h" #include "rtplibraryversion.h" -class RTPSinkMemoryManager : public jrtplib::RTPMemoryManager +#include "util/export.h" + +class SDRBASE_API RTPSinkMemoryManager : public jrtplib::RTPMemoryManager { public: RTPSinkMemoryManager() diff --git a/sdrbase/util/samplesourceserializer.h b/sdrbase/util/samplesourceserializer.h index c1dad5af2..c303b7f38 100644 --- a/sdrbase/util/samplesourceserializer.h +++ b/sdrbase/util/samplesourceserializer.h @@ -18,8 +18,9 @@ #define INCLUDE_UTIL_SAMPLESOURCESERIALIZER_H_ #include "util/simpleserializer.h" +#include "util/export.h" -class SampleSourceSerializer +class SDRBASE_API SampleSourceSerializer { public: struct Data diff --git a/sdrbase/util/simpleserializer.h b/sdrbase/util/simpleserializer.h index cc76c2006..2d02d2e04 100644 --- a/sdrbase/util/simpleserializer.h +++ b/sdrbase/util/simpleserializer.h @@ -6,7 +6,7 @@ #include "dsp/dsptypes.h" #include "util/export.h" -class SDRANGEL_API SimpleSerializer { +class SDRBASE_API SimpleSerializer { public: SimpleSerializer(quint32 version); diff --git a/sdrbase/util/spinlock.h b/sdrbase/util/spinlock.h index 78af0b61a..969a511ac 100644 --- a/sdrbase/util/spinlock.h +++ b/sdrbase/util/spinlock.h @@ -3,7 +3,9 @@ #include -class Spinlock { +#include "util/export.h" + +class SDRBASE_API Spinlock { public: void lock() { diff --git a/sdrbase/util/syncmessenger.h b/sdrbase/util/syncmessenger.h index d9c59ddba..0c6ed44f8 100644 --- a/sdrbase/util/syncmessenger.h +++ b/sdrbase/util/syncmessenger.h @@ -29,7 +29,7 @@ class Message; /** * This class is responsible of managing the synchronous processing of a message across threads */ -class SDRANGEL_API SyncMessenger : public QObject { +class SDRBASE_API SyncMessenger : public QObject { Q_OBJECT public: diff --git a/sdrbase/util/uid.h b/sdrbase/util/uid.h index eb7b82e7f..d612e7e51 100644 --- a/sdrbase/util/uid.h +++ b/sdrbase/util/uid.h @@ -21,7 +21,9 @@ #include -class UidCalculator +#include "util/export.h" + +class SDRBASE_API UidCalculator { public: /** diff --git a/sdrbase/webapi/webapiadapterinterface.h b/sdrbase/webapi/webapiadapterinterface.h index 914a2abac..ac8f559c3 100644 --- a/sdrbase/webapi/webapiadapterinterface.h +++ b/sdrbase/webapi/webapiadapterinterface.h @@ -24,6 +24,8 @@ #include "SWGErrorResponse.h" +#include "util/export.h" + namespace SWGSDRangel { class SWGInstanceSummaryResponse; @@ -48,7 +50,7 @@ namespace SWGSDRangel class SWGSuccessResponse; } -class WebAPIAdapterInterface +class SDRBASE_API WebAPIAdapterInterface { public: virtual ~WebAPIAdapterInterface() {} diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h index 33d981158..bb95aa1fc 100644 --- a/sdrbase/webapi/webapirequestmapper.h +++ b/sdrbase/webapi/webapirequestmapper.h @@ -27,13 +27,15 @@ #include "staticfilecontroller.h" #include "webapiadapterinterface.h" +#include "util/export.h" + namespace SWGSDRangel { class SWGPresetTransfer; class SWGPresetIdentifier; } -class WebAPIRequestMapper : public qtwebapp::HttpRequestHandler { +class SDRBASE_API WebAPIRequestMapper : public qtwebapp::HttpRequestHandler { Q_OBJECT public: WebAPIRequestMapper(QObject* parent=0); diff --git a/sdrbase/webapi/webapiserver.h b/sdrbase/webapi/webapiserver.h index 53b9ae3af..1ae21efc0 100644 --- a/sdrbase/webapi/webapiserver.h +++ b/sdrbase/webapi/webapiserver.h @@ -19,6 +19,8 @@ #ifndef SDRBASE_WEBAPI_WEBAPISERVER_H_ #define SDRBASE_WEBAPI_WEBAPISERVER_H_ +#include "util/export.h" + namespace qtwebapp { class HttpListener; @@ -27,7 +29,7 @@ namespace qtwebapp class WebAPIRequestMapper; -class WebAPIServer +class SDRBASE_API WebAPIServer { public: WebAPIServer(const QString& host, uint16_t port, WebAPIRequestMapper *requestMapper); diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index 79c9bae3d..d38118795 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -20,6 +20,8 @@ #include #include +#include "util/export.h" + class SpectrumVis; class GLSpectrum; class GLSpectrumGUI; @@ -32,7 +34,7 @@ class DeviceSinkAPI; class ChannelMarker; class PluginAPI; -class DeviceUISet +class SDRGUI_API DeviceUISet { public: SpectrumVis *m_spectrumVis; diff --git a/sdrgui/dsp/scopevis.h b/sdrgui/dsp/scopevis.h index e5e896c28..2520a4684 100644 --- a/sdrgui/dsp/scopevis.h +++ b/sdrgui/dsp/scopevis.h @@ -9,7 +9,7 @@ class GLScope; class MessageQueue; -class SDRANGEL_API ScopeVis : public BasebandSampleSink { +class SDRGUI_API ScopeVis : public BasebandSampleSink { public: enum TriggerChannel { TriggerFreeRun, diff --git a/sdrgui/dsp/scopevismulti.h b/sdrgui/dsp/scopevismulti.h index 15bc5d8e9..28c42c43f 100644 --- a/sdrgui/dsp/scopevismulti.h +++ b/sdrgui/dsp/scopevismulti.h @@ -37,7 +37,7 @@ class GLScopeMulti; -class SDRANGEL_API ScopeVisMulti : public QObject { +class SDRGUI_API ScopeVisMulti : public QObject { Q_OBJECT public: enum ProjectionType diff --git a/sdrgui/dsp/scopevisng.h b/sdrgui/dsp/scopevisng.h index c31435fc8..0cbbb64b9 100644 --- a/sdrgui/dsp/scopevisng.h +++ b/sdrgui/dsp/scopevisng.h @@ -38,7 +38,7 @@ class GLScopeNG; -class SDRANGEL_API ScopeVisNG : public BasebandSampleSink { +class SDRGUI_API ScopeVisNG : public BasebandSampleSink { public: enum ProjectionType diff --git a/sdrgui/dsp/spectrumscopecombovis.h b/sdrgui/dsp/spectrumscopecombovis.h index bd0f84e8f..c9b5ababc 100644 --- a/sdrgui/dsp/spectrumscopecombovis.h +++ b/sdrgui/dsp/spectrumscopecombovis.h @@ -8,7 +8,7 @@ class Message; -class SDRANGEL_API SpectrumScopeComboVis : public BasebandSampleSink { +class SDRGUI_API SpectrumScopeComboVis : public BasebandSampleSink { public: SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis); diff --git a/sdrgui/dsp/spectrumscopengcombovis.h b/sdrgui/dsp/spectrumscopengcombovis.h index 3369cf02b..822db1f25 100644 --- a/sdrgui/dsp/spectrumscopengcombovis.h +++ b/sdrgui/dsp/spectrumscopengcombovis.h @@ -8,7 +8,7 @@ class Message; -class SDRANGEL_API SpectrumScopeNGComboVis : public BasebandSampleSink { +class SDRGUI_API SpectrumScopeNGComboVis : public BasebandSampleSink { public: SpectrumScopeNGComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis); diff --git a/sdrgui/dsp/spectrumvis.h b/sdrgui/dsp/spectrumvis.h index 3f3f58ff4..7e237c8f6 100644 --- a/sdrgui/dsp/spectrumvis.h +++ b/sdrgui/dsp/spectrumvis.h @@ -11,7 +11,7 @@ class GLSpectrum; class MessageQueue; -class SDRANGEL_API SpectrumVis : public BasebandSampleSink { +class SDRGUI_API SpectrumVis : public BasebandSampleSink { public: class SDRANGEL_API MsgConfigureSpectrumVis : public Message { diff --git a/sdrgui/gui/aboutdialog.h b/sdrgui/gui/aboutdialog.h index 52190fd2c..204eda624 100644 --- a/sdrgui/gui/aboutdialog.h +++ b/sdrgui/gui/aboutdialog.h @@ -3,11 +3,13 @@ #include +#include "util/export.h" + namespace Ui { class AboutDialog; } -class AboutDialog : public QDialog { +class SDRGUI_API AboutDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/addpresetdialog.h b/sdrgui/gui/addpresetdialog.h index dea9f7bd1..3f7abdebf 100644 --- a/sdrgui/gui/addpresetdialog.h +++ b/sdrgui/gui/addpresetdialog.h @@ -3,11 +3,13 @@ #include +#include "util/export.h" + namespace Ui { class AddPresetDialog; } -class AddPresetDialog : public QDialog { +class SDRGUI_API AddPresetDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/audiodialog.h b/sdrgui/gui/audiodialog.h index 5807cf688..1a2b54756 100644 --- a/sdrgui/gui/audiodialog.h +++ b/sdrgui/gui/audiodialog.h @@ -3,13 +3,15 @@ #include +#include "util/export.h" + class AudioDeviceInfo; namespace Ui { class AudioDialog; } -class AudioDialog : public QDialog { +class SDRGUI_API AudioDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/basicchannelsettingsdialog.h b/sdrgui/gui/basicchannelsettingsdialog.h index eb599ad9a..2185980f4 100644 --- a/sdrgui/gui/basicchannelsettingsdialog.h +++ b/sdrgui/gui/basicchannelsettingsdialog.h @@ -3,13 +3,15 @@ #include +#include "util/export.h" + namespace Ui { class BasicChannelSettingsDialog; } class ChannelMarker; -class BasicChannelSettingsDialog : public QDialog +class SDRGUI_API BasicChannelSettingsDialog : public QDialog { Q_OBJECT diff --git a/sdrgui/gui/buttonswitch.h b/sdrgui/gui/buttonswitch.h index d5c5d7398..d116b3e72 100644 --- a/sdrgui/gui/buttonswitch.h +++ b/sdrgui/gui/buttonswitch.h @@ -3,7 +3,9 @@ #include -class ButtonSwitch : public QToolButton { +#include "util/export.h" + +class SDRGUI_API ButtonSwitch : public QToolButton { Q_OBJECT public: diff --git a/sdrgui/gui/channelwindow.h b/sdrgui/gui/channelwindow.h index 6bc87e3e5..20c1521d0 100644 --- a/sdrgui/gui/channelwindow.h +++ b/sdrgui/gui/channelwindow.h @@ -3,11 +3,13 @@ #include +#include "util/export.h" + class QBoxLayout; class QSpacerItem; class RollupWidget; -class ChannelWindow : public QScrollArea { +class SDRGUI_API ChannelWindow : public QScrollArea { Q_OBJECT public: diff --git a/sdrgui/gui/clickablelabel.h b/sdrgui/gui/clickablelabel.h index 93ae151a5..41769c499 100644 --- a/sdrgui/gui/clickablelabel.h +++ b/sdrgui/gui/clickablelabel.h @@ -21,7 +21,9 @@ #include #include -class ClickableLabel : public QLabel +#include "util/export.h" + +class SDRGUI_API ClickableLabel : public QLabel { Q_OBJECT public: diff --git a/sdrgui/gui/colormapper.h b/sdrgui/gui/colormapper.h index 5937f387d..50cb93241 100644 --- a/sdrgui/gui/colormapper.h +++ b/sdrgui/gui/colormapper.h @@ -12,7 +12,7 @@ #include #include "util/export.h" -class SDRANGEL_API ColorMapper +class SDRGUI_API ColorMapper { public: enum Theme { diff --git a/sdrgui/gui/commanditem.h b/sdrgui/gui/commanditem.h index 1ab492858..acf17398e 100644 --- a/sdrgui/gui/commanditem.h +++ b/sdrgui/gui/commanditem.h @@ -16,7 +16,9 @@ #include -class CommandItem : public QTreeWidgetItem { +#include "util/export.h" + +class SDRGUI_API CommandItem : public QTreeWidgetItem { public: CommandItem(QTreeWidgetItem* parent, const QStringList& strings, const QString& description, int type); bool operator<(const QTreeWidgetItem& other) const; diff --git a/sdrgui/gui/commandkeyreceiver.h b/sdrgui/gui/commandkeyreceiver.h index 5dce1d45f..9b5ed3be6 100644 --- a/sdrgui/gui/commandkeyreceiver.h +++ b/sdrgui/gui/commandkeyreceiver.h @@ -19,9 +19,11 @@ #include +#include "util/export.h" + class QKeyEvent; -class CommandKeyReceiver : public QObject +class SDRGUI_API CommandKeyReceiver : public QObject { Q_OBJECT public: diff --git a/sdrgui/gui/commandoutputdialog.h b/sdrgui/gui/commandoutputdialog.h index aace09a10..dc6f5e406 100644 --- a/sdrgui/gui/commandoutputdialog.h +++ b/sdrgui/gui/commandoutputdialog.h @@ -20,6 +20,8 @@ #include #include +#include "util/export.h" + namespace Ui { class CommandOutputDialog; } diff --git a/sdrgui/gui/cwkeyergui.h b/sdrgui/gui/cwkeyergui.h index 32fa03048..d55d6982f 100644 --- a/sdrgui/gui/cwkeyergui.h +++ b/sdrgui/gui/cwkeyergui.h @@ -31,7 +31,7 @@ class MessageQueue; class CWKeyer; class CWKeyerSettings; -class SDRANGEL_API CWKeyerGUI : public QWidget, public Serializable { +class SDRGUI_API CWKeyerGUI : public QWidget, public Serializable { Q_OBJECT public: diff --git a/sdrgui/gui/editcommanddialog.h b/sdrgui/gui/editcommanddialog.h index 6861194fd..4f957c1a3 100644 --- a/sdrgui/gui/editcommanddialog.h +++ b/sdrgui/gui/editcommanddialog.h @@ -20,6 +20,8 @@ #include #include +#include "util/export.h" + namespace Ui { class EditCommandDialog; } @@ -27,7 +29,7 @@ namespace Ui { class Command; class CommandKeyReceiver; -class EditCommandDialog : public QDialog { +class SDRGUI_API EditCommandDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/externalclockbutton.h b/sdrgui/gui/externalclockbutton.h index b18d1bc40..98598b906 100644 --- a/sdrgui/gui/externalclockbutton.h +++ b/sdrgui/gui/externalclockbutton.h @@ -23,7 +23,9 @@ #include -class ExternalClockButton : public QPushButton { +#include "util/export.h" + +class SDRGUI_API ExternalClockButton : public QPushButton { Q_OBJECT public: diff --git a/sdrgui/gui/externalclockdialog.h b/sdrgui/gui/externalclockdialog.h index 448bc4de0..f77d77387 100644 --- a/sdrgui/gui/externalclockdialog.h +++ b/sdrgui/gui/externalclockdialog.h @@ -23,11 +23,13 @@ #include +#include "util/export.h" + namespace Ui { class ExternalClockDialog; } -class ExternalClockDialog : public QDialog { +class SDRGUI_API ExternalClockDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/glscope.h b/sdrgui/gui/glscope.h index 8319583b6..558705823 100644 --- a/sdrgui/gui/glscope.h +++ b/sdrgui/gui/glscope.h @@ -39,7 +39,7 @@ class ScopeVis; class QPainter; -class SDRANGEL_API GLScope: public QGLWidget { +class SDRGUI_API GLScope: public QGLWidget { Q_OBJECT public: diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h index 38866cbd5..982f0bd3c 100644 --- a/sdrgui/gui/glscopegui.h +++ b/sdrgui/gui/glscopegui.h @@ -15,7 +15,7 @@ namespace Ui { class MessageQueue; class GLScope; -class SDRANGEL_API GLScopeGUI : public QWidget, public Serializable { +class SDRGUI_API GLScopeGUI : public QWidget, public Serializable { Q_OBJECT public: diff --git a/sdrgui/gui/glscopemulti.h b/sdrgui/gui/glscopemulti.h index 5466522a1..5a3cac400 100644 --- a/sdrgui/gui/glscopemulti.h +++ b/sdrgui/gui/glscopemulti.h @@ -35,7 +35,7 @@ class QPainter; -class SDRANGEL_API GLScopeMulti: public QGLWidget { +class SDRGUI_API GLScopeMulti: public QGLWidget { Q_OBJECT public: diff --git a/sdrgui/gui/glscopemultigui.h b/sdrgui/gui/glscopemultigui.h index 0c04df3dc..cdae7726f 100644 --- a/sdrgui/gui/glscopemultigui.h +++ b/sdrgui/gui/glscopemultigui.h @@ -33,7 +33,7 @@ namespace Ui { class MessageQueue; class GLScopeMulti; -class SDRANGEL_API GLScopeMultiGUI : public QWidget { +class SDRGUI_API GLScopeMultiGUI : public QWidget { Q_OBJECT public: diff --git a/sdrgui/gui/glscopeng.h b/sdrgui/gui/glscopeng.h index e28816e51..317ddb522 100644 --- a/sdrgui/gui/glscopeng.h +++ b/sdrgui/gui/glscopeng.h @@ -35,7 +35,7 @@ class QPainter; -class SDRANGEL_API GLScopeNG: public QGLWidget { +class SDRGUI_API GLScopeNG: public QGLWidget { Q_OBJECT public: diff --git a/sdrgui/gui/glscopenggui.h b/sdrgui/gui/glscopenggui.h index 8b3c67891..f82d9f90b 100644 --- a/sdrgui/gui/glscopenggui.h +++ b/sdrgui/gui/glscopenggui.h @@ -34,7 +34,7 @@ namespace Ui { class MessageQueue; class GLScopeNG; -class SDRANGEL_API GLScopeNGGUI : public QWidget, public Serializable { +class SDRGUI_API GLScopeNGGUI : public QWidget, public Serializable { Q_OBJECT public: diff --git a/sdrgui/gui/glshadersimple.h b/sdrgui/gui/glshadersimple.h index 633f621f8..929d17f03 100644 --- a/sdrgui/gui/glshadersimple.h +++ b/sdrgui/gui/glshadersimple.h @@ -21,11 +21,13 @@ #include #include +#include "util/export.h" + class QOpenGLShaderProgram; class QMatrix4x4; class QVector4D; -class GLShaderSimple +class SDRGUI_API GLShaderSimple { public: GLShaderSimple(); diff --git a/sdrgui/gui/glshadertextured.h b/sdrgui/gui/glshadertextured.h index a20daacc5..59d411fdd 100644 --- a/sdrgui/gui/glshadertextured.h +++ b/sdrgui/gui/glshadertextured.h @@ -25,11 +25,13 @@ #include #include +#include "util/export.h" + class QOpenGLShaderProgram; class QMatrix4x4; class QImage; -class GLShaderTextured +class SDRGUI_API GLShaderTextured { public: GLShaderTextured(); diff --git a/sdrgui/gui/glspectrum.h b/sdrgui/gui/glspectrum.h index f00da8249..57c7a7456 100644 --- a/sdrgui/gui/glspectrum.h +++ b/sdrgui/gui/glspectrum.h @@ -37,7 +37,7 @@ class QOpenGLShaderProgram; -class SDRANGEL_API GLSpectrum : public QGLWidget { +class SDRGUI_API GLSpectrum : public QGLWidget { Q_OBJECT public: diff --git a/sdrgui/gui/glspectrumgui.h b/sdrgui/gui/glspectrumgui.h index 4f29d9da9..3ee2cf481 100644 --- a/sdrgui/gui/glspectrumgui.h +++ b/sdrgui/gui/glspectrumgui.h @@ -14,7 +14,7 @@ class MessageQueue; class SpectrumVis; class GLSpectrum; -class SDRANGEL_API GLSpectrumGUI : public QWidget, public Serializable { +class SDRGUI_API GLSpectrumGUI : public QWidget, public Serializable { Q_OBJECT public: diff --git a/sdrgui/gui/indicator.h b/sdrgui/gui/indicator.h index 66e505810..ee9aa75f9 100644 --- a/sdrgui/gui/indicator.h +++ b/sdrgui/gui/indicator.h @@ -21,7 +21,7 @@ #include #include "util/export.h" -class SDRANGEL_API Indicator : public QWidget { +class SDRGUI_API Indicator : public QWidget { private: Q_OBJECT; diff --git a/sdrgui/gui/levelmeter.h b/sdrgui/gui/levelmeter.h index 07a52d1f1..e7f6084ca 100644 --- a/sdrgui/gui/levelmeter.h +++ b/sdrgui/gui/levelmeter.h @@ -52,13 +52,14 @@ #include "dsp/dsptypes.h" #include "gui/scaleengine.h" +#include "util/export.h" /** * Widget which displays a vertical audio level meter, indicating the * RMS and peak levels of the window of audio samples most recently analyzed * by the Engine. */ -class LevelMeter : public QWidget +class SDRGUI_API LevelMeter : public QWidget { Q_OBJECT diff --git a/sdrgui/gui/loggingdialog.h b/sdrgui/gui/loggingdialog.h index 043399284..e5e016f2b 100644 --- a/sdrgui/gui/loggingdialog.h +++ b/sdrgui/gui/loggingdialog.h @@ -20,12 +20,13 @@ #include #include "settings/mainsettings.h" +#include "util/export.h" namespace Ui { class LoggingDialog; } -class LoggingDialog : public QDialog { +class SDRGUI_API LoggingDialog : public QDialog { Q_OBJECT public: explicit LoggingDialog(MainSettings& mainSettings, QWidget* parent = 0); diff --git a/sdrgui/gui/mypositiondialog.h b/sdrgui/gui/mypositiondialog.h index 89bf087ac..c4f834f76 100644 --- a/sdrgui/gui/mypositiondialog.h +++ b/sdrgui/gui/mypositiondialog.h @@ -23,12 +23,13 @@ #include #include "settings/mainsettings.h" +#include "util/export.h" namespace Ui { class MyPositionDialog; } -class MyPositionDialog : public QDialog { +class SDRGUI_API MyPositionDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/pluginsdialog.h b/sdrgui/gui/pluginsdialog.h index d0f7305a7..591d51127 100644 --- a/sdrgui/gui/pluginsdialog.h +++ b/sdrgui/gui/pluginsdialog.h @@ -3,12 +3,13 @@ #include #include "plugin/pluginmanager.h" +#include "util/export.h" namespace Ui { class PluginsDialog; } -class PluginsDialog : public QDialog { +class SDRGUI_API PluginsDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/presetitem.h b/sdrgui/gui/presetitem.h index fa455435b..8735b071f 100644 --- a/sdrgui/gui/presetitem.h +++ b/sdrgui/gui/presetitem.h @@ -17,7 +17,9 @@ #include -class PresetItem : public QTreeWidgetItem { +#include "util/export.h" + +class SDRGUI_API PresetItem : public QTreeWidgetItem { public: PresetItem(QTreeWidgetItem* parent, const QStringList& strings, quint64 frequency, int type); bool operator<(const QTreeWidgetItem& other) const; diff --git a/sdrgui/gui/rollupwidget.h b/sdrgui/gui/rollupwidget.h index 4a6514a53..d5f746b08 100644 --- a/sdrgui/gui/rollupwidget.h +++ b/sdrgui/gui/rollupwidget.h @@ -4,7 +4,7 @@ #include #include "util/export.h" -class SDRANGEL_API RollupWidget : public QWidget { +class SDRGUI_API RollupWidget : public QWidget { Q_OBJECT public: diff --git a/sdrgui/gui/samplingdevicecontrol.h b/sdrgui/gui/samplingdevicecontrol.h index 462a84a68..260ad9cc1 100644 --- a/sdrgui/gui/samplingdevicecontrol.h +++ b/sdrgui/gui/samplingdevicecontrol.h @@ -33,7 +33,7 @@ class PluginManager; class DeviceSourceAPI; class DeviceSinkAPI; -class SDRANGEL_API SamplingDeviceControl : public QWidget { +class SDRGUI_API SamplingDeviceControl : public QWidget { Q_OBJECT public: diff --git a/sdrgui/gui/samplingdevicedialog.h b/sdrgui/gui/samplingdevicedialog.h index 6e771fa33..059a1ac51 100644 --- a/sdrgui/gui/samplingdevicedialog.h +++ b/sdrgui/gui/samplingdevicedialog.h @@ -24,11 +24,13 @@ #include #include +#include "util/export.h" + namespace Ui { class SamplingDeviceDialog; } -class SamplingDeviceDialog : public QDialog { +class SDRGUI_API SamplingDeviceDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/scaleengine.h b/sdrgui/gui/scaleengine.h index 3746dbe05..41874d1f4 100644 --- a/sdrgui/gui/scaleengine.h +++ b/sdrgui/gui/scaleengine.h @@ -24,7 +24,7 @@ #include "physicalunit.h" #include "util/export.h" -class SDRANGEL_API ScaleEngine { +class SDRGUI_API ScaleEngine { public: struct Tick { float pos; diff --git a/sdrgui/gui/tickedslider.h b/sdrgui/gui/tickedslider.h index 050881223..67b33b2d5 100644 --- a/sdrgui/gui/tickedslider.h +++ b/sdrgui/gui/tickedslider.h @@ -22,7 +22,9 @@ #include #include -class TickedSlider : public QSlider +#include "util/export.h" + +class SDRGUI_API TickedSlider : public QSlider { public: TickedSlider(QWidget* parent = 0); diff --git a/sdrgui/gui/transverterbutton.h b/sdrgui/gui/transverterbutton.h index b526fb02c..c4b19a9fc 100644 --- a/sdrgui/gui/transverterbutton.h +++ b/sdrgui/gui/transverterbutton.h @@ -23,7 +23,9 @@ #include -class TransverterButton : public QPushButton { +#include "util/export.h" + +class SDRGUI_API TransverterButton : public QPushButton { Q_OBJECT public: diff --git a/sdrgui/gui/transverterdialog.h b/sdrgui/gui/transverterdialog.h index 581617482..892f0c058 100644 --- a/sdrgui/gui/transverterdialog.h +++ b/sdrgui/gui/transverterdialog.h @@ -23,11 +23,13 @@ #include +#include "util/export.h" + namespace Ui { class TransverterDialog; } -class TransverterDialog : public QDialog { +class SDRGUI_API TransverterDialog : public QDialog { Q_OBJECT public: diff --git a/sdrgui/gui/valuedial.h b/sdrgui/gui/valuedial.h index a0bf7b104..6c9e020bf 100644 --- a/sdrgui/gui/valuedial.h +++ b/sdrgui/gui/valuedial.h @@ -20,7 +20,7 @@ #include "gui/colormapper.h" #include "util/export.h" -class SDRANGEL_API ValueDial : public QWidget { +class SDRGUI_API ValueDial : public QWidget { Q_OBJECT public: diff --git a/sdrgui/gui/valuedialz.h b/sdrgui/gui/valuedialz.h index 0be7cf95b..c313d550f 100644 --- a/sdrgui/gui/valuedialz.h +++ b/sdrgui/gui/valuedialz.h @@ -23,7 +23,7 @@ #include "gui/colormapper.h" #include "util/export.h" -class SDRANGEL_API ValueDialZ : public QWidget { +class SDRGUI_API ValueDialZ : public QWidget { Q_OBJECT public: diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index f423ea50b..b4785d5c7 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -66,7 +66,7 @@ namespace Ui { class MainWindow; } -class SDRANGEL_API MainWindow : public QMainWindow { +class SDRGUI_API MainWindow : public QMainWindow { Q_OBJECT public: diff --git a/sdrgui/webapi/webapiadaptergui.h b/sdrgui/webapi/webapiadaptergui.h index 5b5891d91..b82124fff 100644 --- a/sdrgui/webapi/webapiadaptergui.h +++ b/sdrgui/webapi/webapiadaptergui.h @@ -22,10 +22,11 @@ #include #include "webapi/webapiadapterinterface.h" +#include "util/export.h" class MainWindow; -class WebAPIAdapterGUI: public WebAPIAdapterInterface +class SDRGUI_API WebAPIAdapterGUI: public WebAPIAdapterInterface { public: WebAPIAdapterGUI(MainWindow& mainWindow);