Moved export.h file to root of exports directory and removed util

2018-03-20 13:49:21 +01:00 · 2018-03-20 13:49:21 +01:00 · 72e29fd3f8
commit 72e29fd3f8
--- a/devices/bladerf/devicebladerf.h
+++ b/devices/bladerf/devicebladerf.h
@ -19,7 +19,7 @@

 #include <libbladeRF.h>

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DeviceBladeRF
 {
--- a/devices/bladerf/devicebladerfshared.h
+++ b/devices/bladerf/devicebladerfshared.h
@ -18,7 +18,7 @@
 #define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_

 #include "util/message.h"
-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DeviceBladeRFShared
 {
--- a/devices/bladerf/devicebladerfvalues.h
+++ b/devices/bladerf/devicebladerfvalues.h
@ -17,7 +17,7 @@
 #ifndef DEVICES_BLADERF_DEVICEBLADERFVALUES_H_
 #define DEVICES_BLADERF_DEVICEBLADERFVALUES_H_

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DeviceBladeRFBandwidths {
 public:
--- a/devices/hackrf/devicehackrf.h
+++ b/devices/hackrf/devicehackrf.h
@ -19,7 +19,7 @@

 #include "libhackrf/hackrf.h"

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DeviceHackRF
 {
--- a/devices/hackrf/devicehackrfshared.h
+++ b/devices/hackrf/devicehackrfshared.h
@ -18,7 +18,7 @@
 #define DEVICES_HACKRF_DEVICEHACKRFSHARED_H_

 #include "util/message.h"
-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DeviceHackRFShared
 {
--- a/devices/hackrf/devicehackrfvalues.h
+++ b/devices/hackrf/devicehackrfvalues.h
@ -17,7 +17,7 @@
 #ifndef DEVICES_HACKRF_DEVICEHACKRFVALUES_H_
 #define DEVICES_HACKRF_DEVICEHACKRFVALUES_H_

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API HackRFBandwidths {
 public:
--- a/devices/limesdr/devicelimesdr.h
+++ b/devices/limesdr/devicelimesdr.h
@ -19,7 +19,7 @@

 #include "lime/LimeSuite.h"

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DeviceLimeSDR
 {
--- a/devices/limesdr/devicelimesdrparam.h
+++ b/devices/limesdr/devicelimesdrparam.h
@ -19,7 +19,7 @@

 #include "lime/LimeSuite.h"

-#include "util/export.h"
+#include "export.h"

 /**
 * This structure refers to one physical device shared among parties (logical devices represented by
--- a/devices/limesdr/devicelimesdrshared.h
+++ b/devices/limesdr/devicelimesdrshared.h
@ -20,7 +20,7 @@
 #include <cstddef>
 #include "devicelimesdrparam.h"
 #include "util/message.h"
-#include "util/export.h"
+#include "export.h"

 /**
 * Structure shared by a buddy with other buddies
--- a/devices/perseus/deviceperseus.h
+++ b/devices/perseus/deviceperseus.h
@ -19,7 +19,7 @@

 #include "deviceperseusscan.h"

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DevicePerseus
 {
--- a/devices/perseus/deviceperseusscan.h
+++ b/devices/perseus/deviceperseusscan.h
@ -23,7 +23,7 @@
 #include <map>
 #include <QString>

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DevicePerseusScan
 {
--- a/devices/plutosdr/deviceplutosdr.h
+++ b/devices/plutosdr/deviceplutosdr.h
@ -22,7 +22,7 @@
 #include "deviceplutosdrscan.h"
 #include "deviceplutosdrbox.h"

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DevicePlutoSDR
 {
--- a/devices/plutosdr/deviceplutosdrbox.h
+++ b/devices/plutosdr/deviceplutosdrbox.h
@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include "deviceplutosdrscan.h"

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DevicePlutoSDRBox
 {
--- a/devices/plutosdr/deviceplutosdrparams.h
+++ b/devices/plutosdr/deviceplutosdrparams.h
@ -19,7 +19,7 @@

 #include <string>

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DevicePlutoSDRBox;

--- a/devices/plutosdr/deviceplutosdrscan.h
+++ b/devices/plutosdr/deviceplutosdrscan.h
@ -21,7 +21,7 @@
 #include <vector>
 #include <map>

-#include "util/export.h"
+#include "export.h"

 class DEVICES_API DevicePlutoSDRScan
 {
--- a/devices/plutosdr/deviceplutosdrshared.h
+++ b/devices/plutosdr/deviceplutosdrshared.h
@ -20,7 +20,7 @@
 #include <stdint.h>

 #include "util/message.h"
-#include "util/export.h"
+#include "export.h"

 class DevicePlutoSDRParams;

--- a/exports/util/export.h
+++ b/exports/util/export.h
--- a/httpserver/httpconnectionhandler.h
+++ b/httpserver/httpconnectionhandler.h
@ -18,7 +18,7 @@
 #include "httprequesthandler.h"
 #include "httplistenersettings.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httpconnectionhandlerpool.h
+++ b/httpserver/httpconnectionhandlerpool.h
@ -9,7 +9,7 @@
 #include "httpconnectionhandler.h"
 #include "httplistenersettings.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httpcookie.h
+++ b/httpserver/httpcookie.h
@ -10,7 +10,7 @@
 #include <QByteArray>
 #include "httpglobal.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httplistener.h
+++ b/httpserver/httplistener.h
@ -15,7 +15,7 @@
 #include "httprequesthandler.h"
 #include "httplistenersettings.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httprequest.h
+++ b/httpserver/httprequest.h
@ -17,7 +17,7 @@
 #include "httpglobal.h"
 #include "httplistenersettings.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httprequesthandler.h
+++ b/httpserver/httprequesthandler.h
@ -10,7 +10,7 @@
 #include "httprequest.h"
 #include "httpresponse.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httpresponse.h
+++ b/httpserver/httpresponse.h
@ -12,7 +12,7 @@
 #include "httpglobal.h"
 #include "httpcookie.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httpsession.h
+++ b/httpserver/httpsession.h
@ -11,7 +11,7 @@
 #include <QReadWriteLock>
 #include "httpglobal.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/httpsessionstore.h
+++ b/httpserver/httpsessionstore.h
@ -16,7 +16,7 @@
 #include "httprequest.h"
 #include "httpsessionssettings.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/httpserver/staticfilecontroller.h
+++ b/httpserver/staticfilecontroller.h
@ -13,7 +13,7 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/logging/dualfilelogger.h
+++ b/logging/dualfilelogger.h
@ -13,7 +13,7 @@
 #include "logger.h"
 #include "filelogger.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/logging/filelogger.h
+++ b/logging/filelogger.h
@ -15,7 +15,7 @@
 #include "logger.h"
 #include "fileloggersettings.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/logging/logger.h
+++ b/logging/logger.h
@ -15,7 +15,7 @@
 #include "logglobal.h"
 #include "logmessage.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/logging/loggerwithfile.h
+++ b/logging/loggerwithfile.h
@ -12,7 +12,7 @@
 #include "logger.h"
 #include "filelogger.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/logging/logmessage.h
+++ b/logging/logmessage.h
@ -11,7 +11,7 @@
 #include <QHash>
 #include "logglobal.h"

-#include "util/export.h"
+#include "export.h"

 namespace qtwebapp {

--- a/qrtplib/rtcpapppacket.h
+++ b/qrtplib/rtcpapppacket.h
@ -43,7 +43,7 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpbyepacket.h
+++ b/qrtplib/rtcpbyepacket.h
@ -43,7 +43,7 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpcompoundpacket.h
+++ b/qrtplib/rtcpcompoundpacket.h
@ -43,7 +43,7 @@
 #include "rtpendian.h"
 #include <list>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpcompoundpacketbuilder.h
+++ b/qrtplib/rtcpcompoundpacketbuilder.h
@ -46,7 +46,7 @@
 #include "rtpendian.h"
 #include <list>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcppacketbuilder.h
+++ b/qrtplib/rtcppacketbuilder.h
@ -44,7 +44,7 @@
 #include "rtcpsdesinfo.h"
 #include "rtptimeutilities.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcprrpacket.h
+++ b/qrtplib/rtcprrpacket.h
@ -43,7 +43,7 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpscheduler.h
+++ b/qrtplib/rtcpscheduler.h
@ -43,7 +43,7 @@
 #include "rtprandom.h"
 #include <cstddef>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpsdesinfo.h
+++ b/qrtplib/rtcpsdesinfo.h
@ -45,7 +45,7 @@
 #include <string.h>
 #include <list>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpsdespacket.h
+++ b/qrtplib/rtcpsdespacket.h
@ -44,7 +44,7 @@
 #include "rtpdefines.h"
 #include "rtpendian.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtcpsrpacket.h
+++ b/qrtplib/rtcpsrpacket.h
@ -44,7 +44,7 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpaddress.h
+++ b/qrtplib/rtpaddress.h
@ -43,7 +43,7 @@
 #include <stdint.h>
 #include <QHostAddress>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpcollisionlist.h
+++ b/qrtplib/rtpcollisionlist.h
@ -43,7 +43,7 @@
 #include "rtptimeutilities.h"
 #include <list>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpinternalsourcedata.h
+++ b/qrtplib/rtpinternalsourcedata.h
@ -44,7 +44,7 @@
 #include "rtptimeutilities.h"
 #include "rtpsources.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtppacketbuilder.h
+++ b/qrtplib/rtppacketbuilder.h
@ -45,7 +45,7 @@
 #include "rtptimeutilities.h"
 #include "rtptypes.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtprandom.h
+++ b/qrtplib/rtprandom.h
@ -42,7 +42,7 @@
 #include "rtptypes.h"
 #include <stdlib.h>

-#include "util/export.h"
+#include "export.h"

 #define RTPRANDOM_2POWMIN63										1.08420217248550443400745280086994171142578125e-19

--- a/qrtplib/rtprandomrand48.h
+++ b/qrtplib/rtprandomrand48.h
@ -42,7 +42,7 @@
 #include "rtprandom.h"
 #include <stdio.h>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtprandomrands.h
+++ b/qrtplib/rtprandomrands.h
@ -41,7 +41,7 @@
 #include "rtpconfig.h"
 #include "rtprandom.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtprandomurandom.h
+++ b/qrtplib/rtprandomurandom.h
@ -42,7 +42,7 @@
 #include "rtprandom.h"
 #include <stdio.h>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpsession.h
+++ b/qrtplib/rtpsession.h
@ -49,7 +49,7 @@
 #include "rtcpcompoundpacketbuilder.h"
 #include <list>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpsessionparams.h
+++ b/qrtplib/rtpsessionparams.h
@ -44,7 +44,7 @@
 #include "rtptimeutilities.h"
 #include "rtpsources.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpsessionsources.h
+++ b/qrtplib/rtpsessionsources.h
@ -41,7 +41,7 @@
 #include "rtpconfig.h"
 #include "rtpsources.h"

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpsourcedata.h
+++ b/qrtplib/rtpsourcedata.h
@ -46,7 +46,7 @@
 #include "rtpsources.h"
 #include <list>

-#include "util/export.h"
+#include "export.h"

 namespace qrtplib
 {
--- a/qrtplib/rtpsources.h
+++ b/qrtplib/rtpsources.h
@ -43,7 +43,7 @@
 #include "rtcpsdespacket.h"
 #include "rtptypes.h"

-#include "util/export.h"
+#include "export.h"

 #define RTPSOURCES_HASHSIZE							8317

--- a/qrtplib/rtptimeutilities.h
+++ b/qrtplib/rtptimeutilities.h
@ -46,7 +46,7 @@
 #include <errno.h>
 #endif // RTP_HAVE_QUERYPERFORMANCECOUNTER

-#include "util/export.h"
+#include "export.h"

 #define RTP_NTPTIMEOFFSET									2208988800UL

--- a/qrtplib/rtpudptransmitter.h
+++ b/qrtplib/rtpudptransmitter.h
@ -34,7 +34,7 @@
 #define QRTPLIB_RTPUDPTRANSMITTER_H_

 #include "rtptransmitter.h"
-#include "util/export.h"
+#include "export.h"

 #include <QObject>
 #include <QHostAddress>
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@ -168,7 +168,7 @@ set(sdrbase_HEADERS
    util/CRC64.h
    util/db.h
    util/doublebuffer.h
-    #util/export.h
+    #export.h
    util/fixedtraits.h
    util/message.h
    util/messagequeue.h
--- a/sdrbase/audio/audiodeviceinfo.h
+++ b/sdrbase/audio/audiodeviceinfo.h
@ -22,7 +22,7 @@
 #include <QList>
 #include <QAudioDeviceInfo>

-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API AudioDeviceInfo {
 public:
--- a/sdrbase/audio/audiofifo.h
+++ b/sdrbase/audio/audiofifo.h
@ -23,7 +23,7 @@
 #include <QWaitCondition>

 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"
 //#include "util/udpsink.h"

 class AudioNetSink;
--- a/sdrbase/audio/audioinput.h
+++ b/sdrbase/audio/audioinput.h
@ -22,7 +22,7 @@
 #include <QAudioFormat>
 #include <list>
 #include <vector>
-#include "util/export.h"
+#include "export.h"

 class QAudioInput;
 class AudioFifo;
--- a/sdrbase/audio/audionetsink.h
+++ b/sdrbase/audio/audionetsink.h
@ -19,7 +19,7 @@
 #define SDRBASE_AUDIO_AUDIONETSINK_H_

 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"

 #include <QObject>
 #include <QHostAddress>
--- a/sdrbase/audio/audiooutput.h
+++ b/sdrbase/audio/audiooutput.h
@ -23,7 +23,7 @@
 #include <QAudioFormat>
 #include <list>
 #include <vector>
-#include "util/export.h"
+#include "export.h"

 class QAudioOutput;
 class AudioFifo;
--- a/sdrbase/channel/channelsinkapi.h
+++ b/sdrbase/channel/channelsinkapi.h
@ -23,7 +23,7 @@
 #include <QByteArray>
 #include <stdint.h>

-#include "util/export.h"
+#include "export.h"

 namespace SWGSDRangel
 {
--- a/sdrbase/channel/channelsourceapi.h
+++ b/sdrbase/channel/channelsourceapi.h
@ -22,7 +22,7 @@
 #include <QString>
 #include <stdint.h>

-#include "util/export.h"
+#include "export.h"

 namespace SWGSDRangel
 {
--- a/sdrbase/commands/command.h
+++ b/sdrbase/commands/command.h
@ -25,7 +25,7 @@
 #include <QProcess>
 #include <sys/time.h>

-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API Command : public QObject
 {
--- a/sdrbase/device/deviceenumerator.h
+++ b/sdrbase/device/deviceenumerator.h
@ -20,7 +20,7 @@
 #include <vector>

 #include "plugin/plugininterface.h"
-#include "util/export.h"
+#include "export.h"

 class PluginManager;

--- a/sdrbase/device/devicesinkapi.h
+++ b/sdrbase/device/devicesinkapi.h
@ -21,7 +21,7 @@
 #include <QString>

 #include "dsp/dspdevicesinkengine.h"
-#include "util/export.h"
+#include "export.h"

 class BasebandSampleSource;
 class ThreadedBasebandSampleSource;
--- a/sdrbase/device/devicesourceapi.h
+++ b/sdrbase/device/devicesourceapi.h
@ -23,7 +23,7 @@

 #include "dsp/dspdevicesourceengine.h"

-#include "util/export.h"
+#include "export.h"

 class BasebandSampleSink;
 class ThreadedBasebandSampleSink;
--- a/sdrbase/dsp/afsquelch.h
+++ b/sdrbase/dsp/afsquelch.h
@ -19,7 +19,7 @@

 #include "dsp/dsptypes.h"
 #include "dsp/movingaverage.h"
-#include "util/export.h"
+#include "export.h"

 /** AFSquelch: AF squelch class based on the Modified Goertzel
 * algorithm.
--- a/sdrbase/dsp/agc.h
+++ b/sdrbase/dsp/agc.h
@ -10,7 +10,7 @@

 #include "movingaverage.h"
 #include "util/movingaverage.h"
-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API AGC
 {
--- a/sdrbase/dsp/basebandsamplesink.h
+++ b/sdrbase/dsp/basebandsamplesink.h
@ -20,7 +20,7 @@

 #include <QObject>
 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"
 #include "util/messagequeue.h"
 #include "util/message.h"

--- a/sdrbase/dsp/basebandsamplesource.h
+++ b/sdrbase/dsp/basebandsamplesource.h
@ -21,7 +21,7 @@
 #include <QObject>
 #include "dsp/dsptypes.h"
 #include "dsp/samplesourcefifo.h"
-#include "util/export.h"
+#include "export.h"
 #include "util/messagequeue.h"

 class Message;
--- a/sdrbase/dsp/channelmarker.h
+++ b/sdrbase/dsp/channelmarker.h
@ -6,7 +6,7 @@
 #include <QByteArray>

 #include "settings/serializable.h"
-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API ChannelMarker : public QObject, public Serializable {
 	Q_OBJECT
--- a/sdrbase/dsp/ctcssdetector.h
+++ b/sdrbase/dsp/ctcssdetector.h
@ -10,7 +10,7 @@
 #define INCLUDE_GPL_DSP_CTCSSDETECTOR_H_

 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"

 /** CTCSSDetector: Continuous Tone Coded Squelch System
 * tone detector class based on the Modified Goertzel
--- a/sdrbase/dsp/cwkeyer.h
+++ b/sdrbase/dsp/cwkeyer.h
@ -21,7 +21,7 @@
 #include <QObject>
 #include <QMutex>

-#include "util/export.h"
+#include "export.h"
 #include "util/message.h"
 #include "cwkeyersettings.h"

--- a/sdrbase/dsp/cwkeyersettings.h
+++ b/sdrbase/dsp/cwkeyersettings.h
@ -21,7 +21,7 @@
 #include <QString>
 #include <QByteArray>

-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API CWKeyerSettings
 {
--- a/sdrbase/dsp/decimatorsf.h
+++ b/sdrbase/dsp/decimatorsf.h
@ -18,7 +18,7 @@
 #define SDRBASE_DSP_DECIMATORSF_H_

 #include "dsp/inthalfbandfilterdbf.h"
-#include "util/export.h"
+#include "export.h"

 #define DECIMATORSF_HB_FILTER_ORDER 64

--- a/sdrbase/dsp/devicesamplesink.h
+++ b/sdrbase/dsp/devicesamplesink.h
@ -23,7 +23,7 @@
 #include "samplesourcefifo.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
-#include "util/export.h"
+#include "export.h"

 namespace SWGSDRangel
 {
--- a/sdrbase/dsp/devicesamplesource.h
+++ b/sdrbase/dsp/devicesamplesource.h
@ -24,7 +24,7 @@
 #include "samplesinkfifo.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
-#include "util/export.h"
+#include "export.h"

 namespace SWGSDRangel
 {
--- a/sdrbase/dsp/downchannelizer.h
+++ b/sdrbase/dsp/downchannelizer.h
@ -21,7 +21,7 @@
 #include <dsp/basebandsamplesink.h>
 #include <list>
 #include <QMutex>
-#include "util/export.h"
+#include "export.h"
 #include "util/message.h"
 #ifdef SDR_RX_SAMPLE_24BIT
 #include "dsp/inthalfbandfilterdb.h"
--- a/sdrbase/dsp/dspcommands.h
+++ b/sdrbase/dsp/dspcommands.h
@ -21,7 +21,7 @@
 #include <QString>
 #include "util/message.h"
 #include "fftwindow.h"
-#include "util/export.h"
+#include "export.h"

 class DeviceSampleSource;
 class BasebandSampleSink;
--- a/sdrbase/dsp/dspdevicesinkengine.h
+++ b/sdrbase/dsp/dspdevicesinkengine.h
@ -29,7 +29,7 @@
 #include "dsp/fftwindow.h"
 #include "util/messagequeue.h"
 #include "util/syncmessenger.h"
-#include "util/export.h"
+#include "export.h"

 class DeviceSampleSink;
 class BasebandSampleSource;
--- a/sdrbase/dsp/dspdevicesourceengine.h
+++ b/sdrbase/dsp/dspdevicesourceengine.h
@ -26,7 +26,7 @@
 #include "dsp/fftwindow.h"
 #include "util/messagequeue.h"
 #include "util/syncmessenger.h"
-#include "util/export.h"
+#include "export.h"
 #include "util/movingaverage.h"

 class DeviceSampleSource;
--- a/sdrbase/dsp/dspengine.h
+++ b/sdrbase/dsp/dspengine.h
@ -24,7 +24,7 @@
 #include <vector>
 #include "audio/audiooutput.h"
 #include "audio/audioinput.h"
-#include "util/export.h"
+#include "export.h"
 #ifdef DSD_USE_SERIALDV
 #include "dsp/dvserialengine.h"
 #endif
--- a/sdrbase/dsp/dvserialengine.h
+++ b/sdrbase/dsp/dvserialengine.h
@ -24,7 +24,7 @@
 #include <string>
 #include <list>

-#include "util/export.h"
+#include "export.h"

 class QThread;
 class DVSerialWorker;
--- a/sdrbase/dsp/dvserialworker.h
+++ b/sdrbase/dsp/dvserialworker.h
@ -29,7 +29,7 @@
 #include "util/message.h"
 #include "util/syncmessenger.h"
 #include "util/messagequeue.h"
-#include "util/export.h"
+#include "export.h"
 #include "dsp/filtermbe.h"
 #include "dsp/dsptypes.h"

--- a/sdrbase/dsp/fftengine.h
+++ b/sdrbase/dsp/fftengine.h
@ -2,7 +2,7 @@
 #define INCLUDE_FFTENGINE_H

 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API FFTEngine {
 public:
--- a/sdrbase/dsp/fftfilt.h
+++ b/sdrbase/dsp/fftfilt.h
@ -7,7 +7,7 @@

 #include <complex>
 #include "gfft.h"
-#include "util/export.h"
+#include "export.h"

 #undef M_PI
 #define M_PI 3.14159265358979323846
--- a/sdrbase/dsp/fftwengine.h
+++ b/sdrbase/dsp/fftwengine.h
@ -5,7 +5,7 @@
 #include <fftw3.h>
 #include <list>
 #include "dsp/fftengine.h"
-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API FFTWEngine : public FFTEngine {
 public:
--- a/sdrbase/dsp/fftwindow.h
+++ b/sdrbase/dsp/fftwindow.h
@ -22,7 +22,7 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"

 #undef M_PI
 #define M_PI		3.14159265358979323846
--- a/sdrbase/dsp/filerecord.h
+++ b/sdrbase/dsp/filerecord.h
@ -7,7 +7,7 @@
 #include <fstream>

 #include <ctime>
-#include "util/export.h"
+#include "export.h"

 class Message;

--- a/sdrbase/dsp/filtermbe.h
+++ b/sdrbase/dsp/filtermbe.h
@ -58,7 +58,7 @@
 */

 #include "iirfilter.h"
-#include "util/export.h"
+#include "export.h"

 class SDRBASE_API MBEAudioInterpolatorFilter
 {
--- a/sdrbase/dsp/filterrc.h
+++ b/sdrbase/dsp/filterrc.h
@ -19,7 +19,7 @@
 #define INCLUDE_DSP_FILTERRC_H_

 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"

 /** First order low-pass IIR filter for real-valued signals. */
 class SDRBASE_API LowPassFilterRC
--- a/sdrbase/dsp/hbfiltertraits.h
+++ b/sdrbase/dsp/hbfiltertraits.h
@ -19,7 +19,7 @@
 #define SDRBASE_DSP_HBFILTERTRAITS_H_

 #include <stdint.h>
-#include "util/export.h"
+#include "export.h"

 // uses Q1.14 format internally, input and output are S16

--- a/sdrbase/dsp/interpolator.h
+++ b/sdrbase/dsp/interpolator.h
@ -5,7 +5,7 @@
 #include <emmintrin.h>
 #endif
 #include "dsp/dsptypes.h"
-#include "util/export.h"
+#include "export.h"
 #include <stdio.h>
 #ifndef __WINDOWS__
 #include <unistd.h>
--- a/sdrbase/dsp/inthalfbandfilter.h
+++ b/sdrbase/dsp/inthalfbandfilter.h
@ -21,7 +21,7 @@
 #include <stdint.h>
 #include "dsp/dsptypes.h"
 #include "dsp/hbfiltertraits.h"
-#include "util/export.h"
+#include "export.h"

 template<typename AccuType, uint32_t HBFilterOrder>
 class SDRBASE_API IntHalfbandFilter {
--- a/sdrbase/dsp/inthalfbandfilterdb.h
+++ b/sdrbase/dsp/inthalfbandfilterdb.h
@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "dsp/dsptypes.h"
 #include "dsp/hbfiltertraits.h"
-#include "util/export.h"
+#include "export.h"

 template<typename AccuType, uint32_t HBFilterOrder>
 class SDRBASE_API IntHalfbandFilterDB {
--- a/sdrbase/dsp/inthalfbandfilterdbf.h
+++ b/sdrbase/dsp/inthalfbandfilterdbf.h
@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "dsp/dsptypes.h"
 #include "dsp/hbfiltertraits.h"
-#include "util/export.h"
+#include "export.h"

 template<typename AccuType, typename SampleType, uint32_t HBFilterOrder>
 class SDRBASE_API IntHalfbandFilterDBF {
--- a/sdrbase/dsp/inthalfbandfiltereo1.h
+++ b/sdrbase/dsp/inthalfbandfiltereo1.h
@ -27,7 +27,7 @@
 #include "dsp/dsptypes.h"
 #include "dsp/hbfiltertraits.h"
 #include "dsp/inthalfbandfiltereo1i.h"
-#include "util/export.h"
+#include "export.h"

 template<uint32_t HBFilterOrder>
 class SDRBASE_API IntHalfbandFilterEO1 {
--- a/Show More
+++ b/Show More