From 980192548d90ebd0aaa1d3f695091abfd6889fac Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 3 Mar 2018 21:19:59 +0100 Subject: [PATCH] Adapt to MSVC linker: removed SDRANGEL_API --- plugins/channelrx/demodatv/atvscreen.h | 2 +- plugins/channelrx/demoddatv/datvscreen.h | 2 +- sdrbase/dsp/downchannelizer.h | 2 +- sdrbase/dsp/inthalfbandfilter.h | 2 +- sdrbase/dsp/inthalfbandfilterdb.h | 2 +- sdrbase/dsp/inthalfbandfilterdbf.h | 2 +- sdrbase/dsp/inthalfbandfiltereo1.h | 2 +- sdrbase/dsp/upchannelizer.h | 2 +- sdrbase/util/export.h | 2 -- sdrbase/util/simpleserializer.h | 2 +- sdrgui/dsp/spectrumvis.h | 2 +- sdrsrv/maincore.h | 2 +- 12 files changed, 11 insertions(+), 13 deletions(-) diff --git a/plugins/channelrx/demodatv/atvscreen.h b/plugins/channelrx/demodatv/atvscreen.h index 37068aaa0..f2cf82c88 100644 --- a/plugins/channelrx/demodatv/atvscreen.h +++ b/plugins/channelrx/demodatv/atvscreen.h @@ -39,7 +39,7 @@ class QPainter; -class SDRANGEL_API ATVScreen: public QGLWidget, public ATVScreenInterface +class ATVScreen: public QGLWidget, public ATVScreenInterface { Q_OBJECT diff --git a/plugins/channelrx/demoddatv/datvscreen.h b/plugins/channelrx/demoddatv/datvscreen.h index 7dc6b34e0..3f9042b52 100644 --- a/plugins/channelrx/demoddatv/datvscreen.h +++ b/plugins/channelrx/demoddatv/datvscreen.h @@ -35,7 +35,7 @@ class QPainter; -class SDRANGEL_API DATVScreen: public QGLWidget +class DATVScreen: public QGLWidget { Q_OBJECT diff --git a/sdrbase/dsp/downchannelizer.h b/sdrbase/dsp/downchannelizer.h index d41b94677..b1dad6012 100644 --- a/sdrbase/dsp/downchannelizer.h +++ b/sdrbase/dsp/downchannelizer.h @@ -40,7 +40,7 @@ class MessageQueue; class SDRBASE_API DownChannelizer : public BasebandSampleSink { Q_OBJECT public: - class SDRANGEL_API MsgChannelizerNotification : public Message { + class MsgChannelizerNotification : public Message { MESSAGE_CLASS_DECLARATION public: diff --git a/sdrbase/dsp/inthalfbandfilter.h b/sdrbase/dsp/inthalfbandfilter.h index 2a0eec627..6b482d2b2 100644 --- a/sdrbase/dsp/inthalfbandfilter.h +++ b/sdrbase/dsp/inthalfbandfilter.h @@ -24,7 +24,7 @@ #include "util/export.h" template -class SDRANGEL_API IntHalfbandFilter { +class SDRBASE_API IntHalfbandFilter { public: IntHalfbandFilter() : m_ptr(0), diff --git a/sdrbase/dsp/inthalfbandfilterdb.h b/sdrbase/dsp/inthalfbandfilterdb.h index e65dfa59c..f3bb13f53 100644 --- a/sdrbase/dsp/inthalfbandfilterdb.h +++ b/sdrbase/dsp/inthalfbandfilterdb.h @@ -27,7 +27,7 @@ #include "util/export.h" template -class SDRANGEL_API IntHalfbandFilterDB { +class SDRBASE_API IntHalfbandFilterDB { public: IntHalfbandFilterDB(); diff --git a/sdrbase/dsp/inthalfbandfilterdbf.h b/sdrbase/dsp/inthalfbandfilterdbf.h index 01b281f50..9b40edc40 100644 --- a/sdrbase/dsp/inthalfbandfilterdbf.h +++ b/sdrbase/dsp/inthalfbandfilterdbf.h @@ -27,7 +27,7 @@ #include "util/export.h" template -class SDRANGEL_API IntHalfbandFilterDBF { +class SDRBASE_API IntHalfbandFilterDBF { public: IntHalfbandFilterDBF(); diff --git a/sdrbase/dsp/inthalfbandfiltereo1.h b/sdrbase/dsp/inthalfbandfiltereo1.h index b69c1da3a..4d627bed6 100644 --- a/sdrbase/dsp/inthalfbandfiltereo1.h +++ b/sdrbase/dsp/inthalfbandfiltereo1.h @@ -30,7 +30,7 @@ #include "util/export.h" template -class SDRANGEL_API IntHalfbandFilterEO1 { +class SDRBASE_API IntHalfbandFilterEO1 { public: IntHalfbandFilterEO1(); diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h index 644155699..5d16b2c00 100644 --- a/sdrbase/dsp/upchannelizer.h +++ b/sdrbase/dsp/upchannelizer.h @@ -36,7 +36,7 @@ class MessageQueue; class SDRBASE_API UpChannelizer : public BasebandSampleSource { Q_OBJECT public: - class SDRANGEL_API MsgChannelizerNotification : public Message { + class MsgChannelizerNotification : public Message { MESSAGE_CLASS_DECLARATION public: diff --git a/sdrbase/util/export.h b/sdrbase/util/export.h index 6332b9bf7..34e3c2830 100644 --- a/sdrbase/util/export.h +++ b/sdrbase/util/export.h @@ -42,8 +42,6 @@ # 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) diff --git a/sdrbase/util/simpleserializer.h b/sdrbase/util/simpleserializer.h index 2d02d2e04..24a026856 100644 --- a/sdrbase/util/simpleserializer.h +++ b/sdrbase/util/simpleserializer.h @@ -48,7 +48,7 @@ protected: bool writeTag(Type type, quint32 id, quint32 length); }; -class SDRANGEL_API SimpleDeserializer { +class SDRBASE_API SimpleDeserializer { public: SimpleDeserializer(const QByteArray& data); diff --git a/sdrgui/dsp/spectrumvis.h b/sdrgui/dsp/spectrumvis.h index 7e237c8f6..92abd42df 100644 --- a/sdrgui/dsp/spectrumvis.h +++ b/sdrgui/dsp/spectrumvis.h @@ -14,7 +14,7 @@ class MessageQueue; class SDRGUI_API SpectrumVis : public BasebandSampleSink { public: - class SDRANGEL_API MsgConfigureSpectrumVis : public Message { + class MsgConfigureSpectrumVis : public Message { MESSAGE_CLASS_DECLARATION public: diff --git a/sdrsrv/maincore.h b/sdrsrv/maincore.h index daf5dce34..34841682e 100644 --- a/sdrsrv/maincore.h +++ b/sdrsrv/maincore.h @@ -47,7 +47,7 @@ namespace qtwebapp { class LoggerWithFile; } -class SDRANGEL_API MainCore : public QObject { +class MainCore : public QObject { Q_OBJECT public: