From 72e29fd3f8f86f33d779b98421c72a954fdf7312 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 20 Mar 2018 13:49:21 +0100 Subject: [PATCH] Moved export.h file to root of exports directory and removed util --- devices/bladerf/devicebladerf.h | 2 +- devices/bladerf/devicebladerfshared.h | 2 +- devices/bladerf/devicebladerfvalues.h | 2 +- devices/hackrf/devicehackrf.h | 2 +- devices/hackrf/devicehackrfshared.h | 2 +- devices/hackrf/devicehackrfvalues.h | 2 +- devices/limesdr/devicelimesdr.h | 2 +- devices/limesdr/devicelimesdrparam.h | 2 +- devices/limesdr/devicelimesdrshared.h | 2 +- devices/perseus/deviceperseus.h | 2 +- devices/perseus/deviceperseusscan.h | 2 +- devices/plutosdr/deviceplutosdr.h | 2 +- devices/plutosdr/deviceplutosdrbox.h | 2 +- devices/plutosdr/deviceplutosdrparams.h | 2 +- devices/plutosdr/deviceplutosdrscan.h | 2 +- devices/plutosdr/deviceplutosdrshared.h | 2 +- exports/{util => }/export.h | 0 httpserver/httpconnectionhandler.h | 2 +- httpserver/httpconnectionhandlerpool.h | 2 +- httpserver/httpcookie.h | 2 +- httpserver/httplistener.h | 2 +- httpserver/httprequest.h | 2 +- httpserver/httprequesthandler.h | 2 +- httpserver/httpresponse.h | 2 +- httpserver/httpsession.h | 2 +- httpserver/httpsessionstore.h | 2 +- httpserver/staticfilecontroller.h | 2 +- logging/dualfilelogger.h | 2 +- logging/filelogger.h | 2 +- logging/logger.h | 2 +- logging/loggerwithfile.h | 2 +- logging/logmessage.h | 2 +- qrtplib/rtcpapppacket.h | 2 +- qrtplib/rtcpbyepacket.h | 2 +- qrtplib/rtcpcompoundpacket.h | 2 +- qrtplib/rtcpcompoundpacketbuilder.h | 2 +- qrtplib/rtcppacketbuilder.h | 2 +- qrtplib/rtcprrpacket.h | 2 +- qrtplib/rtcpscheduler.h | 2 +- qrtplib/rtcpsdesinfo.h | 2 +- qrtplib/rtcpsdespacket.h | 2 +- qrtplib/rtcpsrpacket.h | 2 +- qrtplib/rtpaddress.h | 2 +- qrtplib/rtpcollisionlist.h | 2 +- qrtplib/rtpinternalsourcedata.h | 2 +- qrtplib/rtppacketbuilder.h | 2 +- qrtplib/rtprandom.h | 2 +- qrtplib/rtprandomrand48.h | 2 +- qrtplib/rtprandomrands.h | 2 +- qrtplib/rtprandomurandom.h | 2 +- qrtplib/rtpsession.h | 2 +- qrtplib/rtpsessionparams.h | 2 +- qrtplib/rtpsessionsources.h | 2 +- qrtplib/rtpsourcedata.h | 2 +- qrtplib/rtpsources.h | 2 +- qrtplib/rtptimeutilities.h | 2 +- qrtplib/rtpudptransmitter.h | 2 +- sdrbase/CMakeLists.txt | 2 +- sdrbase/audio/audiodeviceinfo.h | 2 +- sdrbase/audio/audiofifo.h | 2 +- sdrbase/audio/audioinput.h | 2 +- sdrbase/audio/audionetsink.h | 2 +- sdrbase/audio/audiooutput.h | 2 +- sdrbase/channel/channelsinkapi.h | 2 +- sdrbase/channel/channelsourceapi.h | 2 +- sdrbase/commands/command.h | 2 +- sdrbase/device/deviceenumerator.h | 2 +- sdrbase/device/devicesinkapi.h | 2 +- sdrbase/device/devicesourceapi.h | 2 +- sdrbase/dsp/afsquelch.h | 2 +- sdrbase/dsp/agc.h | 2 +- sdrbase/dsp/basebandsamplesink.h | 2 +- sdrbase/dsp/basebandsamplesource.h | 2 +- sdrbase/dsp/channelmarker.h | 2 +- sdrbase/dsp/ctcssdetector.h | 2 +- sdrbase/dsp/cwkeyer.h | 2 +- sdrbase/dsp/cwkeyersettings.h | 2 +- sdrbase/dsp/decimatorsf.h | 2 +- sdrbase/dsp/devicesamplesink.h | 2 +- sdrbase/dsp/devicesamplesource.h | 2 +- sdrbase/dsp/downchannelizer.h | 2 +- sdrbase/dsp/dspcommands.h | 2 +- sdrbase/dsp/dspdevicesinkengine.h | 2 +- sdrbase/dsp/dspdevicesourceengine.h | 2 +- sdrbase/dsp/dspengine.h | 2 +- sdrbase/dsp/dvserialengine.h | 2 +- sdrbase/dsp/dvserialworker.h | 2 +- sdrbase/dsp/fftengine.h | 2 +- sdrbase/dsp/fftfilt.h | 2 +- sdrbase/dsp/fftwengine.h | 2 +- sdrbase/dsp/fftwindow.h | 2 +- sdrbase/dsp/filerecord.h | 2 +- sdrbase/dsp/filtermbe.h | 2 +- sdrbase/dsp/filterrc.h | 2 +- sdrbase/dsp/hbfiltertraits.h | 2 +- sdrbase/dsp/interpolator.h | 2 +- sdrbase/dsp/inthalfbandfilter.h | 2 +- sdrbase/dsp/inthalfbandfilterdb.h | 2 +- sdrbase/dsp/inthalfbandfilterdbf.h | 2 +- sdrbase/dsp/inthalfbandfiltereo1.h | 2 +- sdrbase/dsp/inthalfbandfilterst.h | 2 +- sdrbase/dsp/kissengine.h | 2 +- sdrbase/dsp/nco.h | 2 +- sdrbase/dsp/ncof.h | 2 +- sdrbase/dsp/nullsink.h | 2 +- sdrbase/dsp/phaselock.h | 2 +- sdrbase/dsp/recursivefilters.h | 2 +- sdrbase/dsp/samplesinkfifo.h | 2 +- sdrbase/dsp/samplesinkfifodoublebuffered.h | 2 +- sdrbase/dsp/samplesourcefifo.h | 2 +- sdrbase/dsp/threadedbasebandsamplesink.h | 2 +- sdrbase/dsp/threadedbasebandsamplesource.h | 2 +- sdrbase/dsp/upchannelizer.h | 2 +- sdrbase/dsp/wfir.h | 2 +- sdrbase/mainparser.h | 2 +- sdrbase/plugin/pluginapi.h | 2 +- sdrbase/plugin/plugininstancegui.h | 2 +- sdrbase/plugin/plugininterface.h | 2 +- sdrbase/plugin/pluginmanager.h | 2 +- sdrbase/sdrbase.pro | 2 +- sdrbase/settings/mainsettings.h | 2 +- sdrbase/settings/preferences.h | 2 +- sdrbase/settings/preset.h | 2 +- sdrbase/util/CRC64.h | 2 +- sdrbase/util/db.h | 2 +- sdrbase/util/fixedtraits.h | 2 +- sdrbase/util/message.h | 2 +- sdrbase/util/messagequeue.h | 2 +- sdrbase/util/prettyprint.h | 2 +- sdrbase/util/rtpsink.h | 2 +- sdrbase/util/samplesourceserializer.h | 2 +- sdrbase/util/simpleserializer.h | 2 +- sdrbase/util/spinlock.h | 2 +- sdrbase/util/syncmessenger.h | 2 +- sdrbase/util/uid.h | 2 +- sdrbase/webapi/webapiadapterinterface.h | 2 +- sdrbase/webapi/webapirequestmapper.h | 2 +- sdrbase/webapi/webapiserver.h | 2 +- sdrgui/device/deviceuiset.h | 2 +- sdrgui/dsp/scopevis.h | 2 +- sdrgui/dsp/scopevismulti.h | 2 +- sdrgui/dsp/scopevisng.h | 2 +- sdrgui/dsp/scopevisxy.h | 2 +- sdrgui/dsp/spectrumscopecombovis.h | 2 +- sdrgui/dsp/spectrumscopengcombovis.h | 2 +- sdrgui/dsp/spectrumvis.h | 2 +- sdrgui/gui/aboutdialog.h | 2 +- sdrgui/gui/addpresetdialog.h | 2 +- sdrgui/gui/audiodialog.h | 2 +- sdrgui/gui/basicchannelsettingsdialog.h | 2 +- sdrgui/gui/buttonswitch.h | 2 +- sdrgui/gui/channelwindow.h | 2 +- sdrgui/gui/clickablelabel.h | 2 +- sdrgui/gui/colormapper.h | 2 +- sdrgui/gui/commanditem.h | 2 +- sdrgui/gui/commandkeyreceiver.h | 2 +- sdrgui/gui/commandoutputdialog.h | 2 +- sdrgui/gui/cwkeyergui.h | 2 +- sdrgui/gui/editcommanddialog.h | 2 +- sdrgui/gui/externalclockbutton.h | 2 +- sdrgui/gui/externalclockdialog.h | 2 +- sdrgui/gui/glscope.h | 2 +- sdrgui/gui/glscopegui.h | 2 +- sdrgui/gui/glscopemulti.h | 2 +- sdrgui/gui/glscopemultigui.h | 2 +- sdrgui/gui/glscopeng.h | 2 +- sdrgui/gui/glscopenggui.h | 2 +- sdrgui/gui/glshadersimple.h | 2 +- sdrgui/gui/glshadertextured.h | 2 +- sdrgui/gui/glspectrum.h | 2 +- sdrgui/gui/glspectrumgui.h | 2 +- sdrgui/gui/indicator.h | 2 +- sdrgui/gui/levelmeter.h | 2 +- sdrgui/gui/loggingdialog.h | 2 +- sdrgui/gui/mypositiondialog.h | 2 +- sdrgui/gui/pluginsdialog.h | 2 +- sdrgui/gui/presetitem.h | 2 +- sdrgui/gui/rollupwidget.h | 2 +- sdrgui/gui/samplingdevicecontrol.h | 2 +- sdrgui/gui/samplingdevicedialog.h | 2 +- sdrgui/gui/scaleengine.h | 2 +- sdrgui/gui/tickedslider.h | 2 +- sdrgui/gui/transverterbutton.h | 2 +- sdrgui/gui/transverterdialog.h | 2 +- sdrgui/gui/tvscreen.h | 2 +- sdrgui/gui/valuedial.h | 2 +- sdrgui/gui/valuedialz.h | 2 +- sdrgui/mainwindow.h | 2 +- sdrgui/webapi/webapiadaptergui.h | 2 +- sdrsrv/maincore.h | 2 +- 190 files changed, 189 insertions(+), 189 deletions(-) rename exports/{util => }/export.h (100%) diff --git a/devices/bladerf/devicebladerf.h b/devices/bladerf/devicebladerf.h index 73233a79b..20c2bab5a 100644 --- a/devices/bladerf/devicebladerf.h +++ b/devices/bladerf/devicebladerf.h @@ -19,7 +19,7 @@ #include -#include "util/export.h" +#include "export.h" class DEVICES_API DeviceBladeRF { diff --git a/devices/bladerf/devicebladerfshared.h b/devices/bladerf/devicebladerfshared.h index 996d7deca..2fe2d7f89 100644 --- 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 { diff --git a/devices/bladerf/devicebladerfvalues.h b/devices/bladerf/devicebladerfvalues.h index 23f57706e..2498e6cd6 100644 --- 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: diff --git a/devices/hackrf/devicehackrf.h b/devices/hackrf/devicehackrf.h index 72e78c048..4cbb39d92 100644 --- 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 { diff --git a/devices/hackrf/devicehackrfshared.h b/devices/hackrf/devicehackrfshared.h index cefa5c32a..249c30852 100644 --- 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 { diff --git a/devices/hackrf/devicehackrfvalues.h b/devices/hackrf/devicehackrfvalues.h index d322e4d06..5f95ed859 100644 --- 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: diff --git a/devices/limesdr/devicelimesdr.h b/devices/limesdr/devicelimesdr.h index f409b31ed..ed748457e 100644 --- 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 { diff --git a/devices/limesdr/devicelimesdrparam.h b/devices/limesdr/devicelimesdrparam.h index e34251d1b..353b256e0 100644 --- 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 diff --git a/devices/limesdr/devicelimesdrshared.h b/devices/limesdr/devicelimesdrshared.h index 6d90a63b5..c8df559e2 100644 --- a/devices/limesdr/devicelimesdrshared.h +++ b/devices/limesdr/devicelimesdrshared.h @@ -20,7 +20,7 @@ #include #include "devicelimesdrparam.h" #include "util/message.h" -#include "util/export.h" +#include "export.h" /** * Structure shared by a buddy with other buddies diff --git a/devices/perseus/deviceperseus.h b/devices/perseus/deviceperseus.h index 3305fdf54..1ac30fcdb 100644 --- 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 { diff --git a/devices/perseus/deviceperseusscan.h b/devices/perseus/deviceperseusscan.h index 4c4e1b3d5..17bc8aca3 100644 --- a/devices/perseus/deviceperseusscan.h +++ b/devices/perseus/deviceperseusscan.h @@ -23,7 +23,7 @@ #include #include -#include "util/export.h" +#include "export.h" class DEVICES_API DevicePerseusScan { diff --git a/devices/plutosdr/deviceplutosdr.h b/devices/plutosdr/deviceplutosdr.h index dbae13e0d..bef2503ab 100644 --- 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 { diff --git a/devices/plutosdr/deviceplutosdrbox.h b/devices/plutosdr/deviceplutosdrbox.h index 4f6ae948e..4941ff30b 100644 --- a/devices/plutosdr/deviceplutosdrbox.h +++ b/devices/plutosdr/deviceplutosdrbox.h @@ -22,7 +22,7 @@ #include #include "deviceplutosdrscan.h" -#include "util/export.h" +#include "export.h" class DEVICES_API DevicePlutoSDRBox { diff --git a/devices/plutosdr/deviceplutosdrparams.h b/devices/plutosdr/deviceplutosdrparams.h index 69f83de66..113b05752 100644 --- a/devices/plutosdr/deviceplutosdrparams.h +++ b/devices/plutosdr/deviceplutosdrparams.h @@ -19,7 +19,7 @@ #include -#include "util/export.h" +#include "export.h" class DEVICES_API DevicePlutoSDRBox; diff --git a/devices/plutosdr/deviceplutosdrscan.h b/devices/plutosdr/deviceplutosdrscan.h index 1ad1d0d41..9d1b24988 100644 --- a/devices/plutosdr/deviceplutosdrscan.h +++ b/devices/plutosdr/deviceplutosdrscan.h @@ -21,7 +21,7 @@ #include #include -#include "util/export.h" +#include "export.h" class DEVICES_API DevicePlutoSDRScan { diff --git a/devices/plutosdr/deviceplutosdrshared.h b/devices/plutosdr/deviceplutosdrshared.h index 5ae24df29..9d98c66a0 100644 --- a/devices/plutosdr/deviceplutosdrshared.h +++ b/devices/plutosdr/deviceplutosdrshared.h @@ -20,7 +20,7 @@ #include #include "util/message.h" -#include "util/export.h" +#include "export.h" class DevicePlutoSDRParams; diff --git a/exports/util/export.h b/exports/export.h similarity index 100% rename from exports/util/export.h rename to exports/export.h diff --git a/httpserver/httpconnectionhandler.h b/httpserver/httpconnectionhandler.h index e205b6585..855956c8d 100644 --- 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 { diff --git a/httpserver/httpconnectionhandlerpool.h b/httpserver/httpconnectionhandlerpool.h index f264d650b..92d43f3b5 100644 --- 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 { diff --git a/httpserver/httpcookie.h b/httpserver/httpcookie.h index 58c84a66b..6d22d9ec1 100644 --- a/httpserver/httpcookie.h +++ b/httpserver/httpcookie.h @@ -10,7 +10,7 @@ #include #include "httpglobal.h" -#include "util/export.h" +#include "export.h" namespace qtwebapp { diff --git a/httpserver/httplistener.h b/httpserver/httplistener.h index d7b5c0282..c10951ef6 100644 --- 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 { diff --git a/httpserver/httprequest.h b/httpserver/httprequest.h index acca03652..e35f6a65e 100644 --- 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 { diff --git a/httpserver/httprequesthandler.h b/httpserver/httprequesthandler.h index c2aa08736..86e22c7a9 100644 --- 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 { diff --git a/httpserver/httpresponse.h b/httpserver/httpresponse.h index 4270a37cb..61060886c 100644 --- 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 { diff --git a/httpserver/httpsession.h b/httpserver/httpsession.h index ed7e673cc..0625a1171 100644 --- a/httpserver/httpsession.h +++ b/httpserver/httpsession.h @@ -11,7 +11,7 @@ #include #include "httpglobal.h" -#include "util/export.h" +#include "export.h" namespace qtwebapp { diff --git a/httpserver/httpsessionstore.h b/httpserver/httpsessionstore.h index 301bc329d..2e789d7c4 100644 --- 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 { diff --git a/httpserver/staticfilecontroller.h b/httpserver/staticfilecontroller.h index 2ff346e85..30f009d25 100644 --- 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 { diff --git a/logging/dualfilelogger.h b/logging/dualfilelogger.h index 6599d6542..f8c0dfadf 100644 --- 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 { diff --git a/logging/filelogger.h b/logging/filelogger.h index 62eb04cc0..3d1723a33 100644 --- 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 { diff --git a/logging/logger.h b/logging/logger.h index ba7de727b..663d4b315 100644 --- 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 { diff --git a/logging/loggerwithfile.h b/logging/loggerwithfile.h index defa586cd..1de8f1b34 100644 --- 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 { diff --git a/logging/logmessage.h b/logging/logmessage.h index 3552f6be0..91df741f4 100644 --- a/logging/logmessage.h +++ b/logging/logmessage.h @@ -11,7 +11,7 @@ #include #include "logglobal.h" -#include "util/export.h" +#include "export.h" namespace qtwebapp { diff --git a/qrtplib/rtcpapppacket.h b/qrtplib/rtcpapppacket.h index d8f36efa0..6a94597e4 100644 --- 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 { diff --git a/qrtplib/rtcpbyepacket.h b/qrtplib/rtcpbyepacket.h index f6f9493e0..16947943d 100644 --- 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 { diff --git a/qrtplib/rtcpcompoundpacket.h b/qrtplib/rtcpcompoundpacket.h index c15aaacd1..461a263b8 100644 --- a/qrtplib/rtcpcompoundpacket.h +++ b/qrtplib/rtcpcompoundpacket.h @@ -43,7 +43,7 @@ #include "rtpendian.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtcpcompoundpacketbuilder.h b/qrtplib/rtcpcompoundpacketbuilder.h index 834599ad5..c66210ab8 100644 --- a/qrtplib/rtcpcompoundpacketbuilder.h +++ b/qrtplib/rtcpcompoundpacketbuilder.h @@ -46,7 +46,7 @@ #include "rtpendian.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtcppacketbuilder.h b/qrtplib/rtcppacketbuilder.h index c19f5a725..593e477c5 100644 --- 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 { diff --git a/qrtplib/rtcprrpacket.h b/qrtplib/rtcprrpacket.h index 2ca047ffb..2b49ad40b 100644 --- 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 { diff --git a/qrtplib/rtcpscheduler.h b/qrtplib/rtcpscheduler.h index a9272ed34..7557414bb 100644 --- a/qrtplib/rtcpscheduler.h +++ b/qrtplib/rtcpscheduler.h @@ -43,7 +43,7 @@ #include "rtprandom.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtcpsdesinfo.h b/qrtplib/rtcpsdesinfo.h index 65cfaa0b7..16e9e2ab9 100644 --- a/qrtplib/rtcpsdesinfo.h +++ b/qrtplib/rtcpsdesinfo.h @@ -45,7 +45,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtcpsdespacket.h b/qrtplib/rtcpsdespacket.h index eaa7c6744..f51cab448 100644 --- 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 { diff --git a/qrtplib/rtcpsrpacket.h b/qrtplib/rtcpsrpacket.h index 20131fc5e..5f8f9172f 100644 --- 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 { diff --git a/qrtplib/rtpaddress.h b/qrtplib/rtpaddress.h index 21b2caf3f..3d69f3941 100644 --- a/qrtplib/rtpaddress.h +++ b/qrtplib/rtpaddress.h @@ -43,7 +43,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtpcollisionlist.h b/qrtplib/rtpcollisionlist.h index e8c5e2616..e17e01c28 100644 --- a/qrtplib/rtpcollisionlist.h +++ b/qrtplib/rtpcollisionlist.h @@ -43,7 +43,7 @@ #include "rtptimeutilities.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtpinternalsourcedata.h b/qrtplib/rtpinternalsourcedata.h index f36f8eba9..42b9e765f 100644 --- 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 { diff --git a/qrtplib/rtppacketbuilder.h b/qrtplib/rtppacketbuilder.h index 6fe1cd689..02c0e8c4d 100644 --- 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 { diff --git a/qrtplib/rtprandom.h b/qrtplib/rtprandom.h index 747f03cd3..fb8fb965a 100644 --- a/qrtplib/rtprandom.h +++ b/qrtplib/rtprandom.h @@ -42,7 +42,7 @@ #include "rtptypes.h" #include -#include "util/export.h" +#include "export.h" #define RTPRANDOM_2POWMIN63 1.08420217248550443400745280086994171142578125e-19 diff --git a/qrtplib/rtprandomrand48.h b/qrtplib/rtprandomrand48.h index 6795c86b3..a4282166a 100644 --- a/qrtplib/rtprandomrand48.h +++ b/qrtplib/rtprandomrand48.h @@ -42,7 +42,7 @@ #include "rtprandom.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtprandomrands.h b/qrtplib/rtprandomrands.h index 58f692a6c..f5a0cf377 100644 --- 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 { diff --git a/qrtplib/rtprandomurandom.h b/qrtplib/rtprandomurandom.h index 4d5cf339c..67b2d1647 100644 --- a/qrtplib/rtprandomurandom.h +++ b/qrtplib/rtprandomurandom.h @@ -42,7 +42,7 @@ #include "rtprandom.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtpsession.h b/qrtplib/rtpsession.h index e81994c7a..d2393ddc9 100644 --- a/qrtplib/rtpsession.h +++ b/qrtplib/rtpsession.h @@ -49,7 +49,7 @@ #include "rtcpcompoundpacketbuilder.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtpsessionparams.h b/qrtplib/rtpsessionparams.h index 9cf6cf790..b58cc424c 100644 --- 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 { diff --git a/qrtplib/rtpsessionsources.h b/qrtplib/rtpsessionsources.h index 92d6b727d..fbb6e22a6 100644 --- 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 { diff --git a/qrtplib/rtpsourcedata.h b/qrtplib/rtpsourcedata.h index 8958cb393..b71256687 100644 --- a/qrtplib/rtpsourcedata.h +++ b/qrtplib/rtpsourcedata.h @@ -46,7 +46,7 @@ #include "rtpsources.h" #include -#include "util/export.h" +#include "export.h" namespace qrtplib { diff --git a/qrtplib/rtpsources.h b/qrtplib/rtpsources.h index 7ddff9bca..4b5c2e1c3 100644 --- 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 diff --git a/qrtplib/rtptimeutilities.h b/qrtplib/rtptimeutilities.h index be885a0c0..d474ff2fc 100644 --- a/qrtplib/rtptimeutilities.h +++ b/qrtplib/rtptimeutilities.h @@ -46,7 +46,7 @@ #include #endif // RTP_HAVE_QUERYPERFORMANCECOUNTER -#include "util/export.h" +#include "export.h" #define RTP_NTPTIMEOFFSET 2208988800UL diff --git a/qrtplib/rtpudptransmitter.h b/qrtplib/rtpudptransmitter.h index 223810a58..ded4f8a3c 100644 --- 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 #include diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index 9217c8647..c56bc4cba 100644 --- 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 diff --git a/sdrbase/audio/audiodeviceinfo.h b/sdrbase/audio/audiodeviceinfo.h index 02938b674..a25c90d75 100644 --- a/sdrbase/audio/audiodeviceinfo.h +++ b/sdrbase/audio/audiodeviceinfo.h @@ -22,7 +22,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRBASE_API AudioDeviceInfo { public: diff --git a/sdrbase/audio/audiofifo.h b/sdrbase/audio/audiofifo.h index fb2760270..22da64b53 100644 --- a/sdrbase/audio/audiofifo.h +++ b/sdrbase/audio/audiofifo.h @@ -23,7 +23,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" //#include "util/udpsink.h" class AudioNetSink; diff --git a/sdrbase/audio/audioinput.h b/sdrbase/audio/audioinput.h index 6e3cc56b5..452ea3de7 100644 --- a/sdrbase/audio/audioinput.h +++ b/sdrbase/audio/audioinput.h @@ -22,7 +22,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" class QAudioInput; class AudioFifo; diff --git a/sdrbase/audio/audionetsink.h b/sdrbase/audio/audionetsink.h index 23cfe93a3..780d9dc49 100644 --- 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 #include diff --git a/sdrbase/audio/audiooutput.h b/sdrbase/audio/audiooutput.h index 4fd1dade4..2840f4e53 100644 --- a/sdrbase/audio/audiooutput.h +++ b/sdrbase/audio/audiooutput.h @@ -23,7 +23,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" class QAudioOutput; class AudioFifo; diff --git a/sdrbase/channel/channelsinkapi.h b/sdrbase/channel/channelsinkapi.h index fab5bc276..ee0494c35 100644 --- a/sdrbase/channel/channelsinkapi.h +++ b/sdrbase/channel/channelsinkapi.h @@ -23,7 +23,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace SWGSDRangel { diff --git a/sdrbase/channel/channelsourceapi.h b/sdrbase/channel/channelsourceapi.h index 5d943ed6d..2b5cf8d59 100644 --- a/sdrbase/channel/channelsourceapi.h +++ b/sdrbase/channel/channelsourceapi.h @@ -22,7 +22,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace SWGSDRangel { diff --git a/sdrbase/commands/command.h b/sdrbase/commands/command.h index 491f89df6..8103b1791 100644 --- a/sdrbase/commands/command.h +++ b/sdrbase/commands/command.h @@ -25,7 +25,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRBASE_API Command : public QObject { diff --git a/sdrbase/device/deviceenumerator.h b/sdrbase/device/deviceenumerator.h index b599dcb61..14dae4048 100644 --- a/sdrbase/device/deviceenumerator.h +++ b/sdrbase/device/deviceenumerator.h @@ -20,7 +20,7 @@ #include #include "plugin/plugininterface.h" -#include "util/export.h" +#include "export.h" class PluginManager; diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 19434b824..1467dd64b 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -21,7 +21,7 @@ #include #include "dsp/dspdevicesinkengine.h" -#include "util/export.h" +#include "export.h" class BasebandSampleSource; class ThreadedBasebandSampleSource; diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h index f8dd69ea3..72286b7ec 100644 --- 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; diff --git a/sdrbase/dsp/afsquelch.h b/sdrbase/dsp/afsquelch.h index 72bca12c4..324fced9d 100644 --- 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. diff --git a/sdrbase/dsp/agc.h b/sdrbase/dsp/agc.h index 2f7a3d71d..3c0b464bd 100644 --- 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 { diff --git a/sdrbase/dsp/basebandsamplesink.h b/sdrbase/dsp/basebandsamplesink.h index f70e93230..21e122434 100644 --- a/sdrbase/dsp/basebandsamplesink.h +++ b/sdrbase/dsp/basebandsamplesink.h @@ -20,7 +20,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "util/messagequeue.h" #include "util/message.h" diff --git a/sdrbase/dsp/basebandsamplesource.h b/sdrbase/dsp/basebandsamplesource.h index a5b2e595c..f9f2a66a9 100644 --- a/sdrbase/dsp/basebandsamplesource.h +++ b/sdrbase/dsp/basebandsamplesource.h @@ -21,7 +21,7 @@ #include #include "dsp/dsptypes.h" #include "dsp/samplesourcefifo.h" -#include "util/export.h" +#include "export.h" #include "util/messagequeue.h" class Message; diff --git a/sdrbase/dsp/channelmarker.h b/sdrbase/dsp/channelmarker.h index 87bcb45e1..a2981a01e 100644 --- a/sdrbase/dsp/channelmarker.h +++ b/sdrbase/dsp/channelmarker.h @@ -6,7 +6,7 @@ #include #include "settings/serializable.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API ChannelMarker : public QObject, public Serializable { Q_OBJECT diff --git a/sdrbase/dsp/ctcssdetector.h b/sdrbase/dsp/ctcssdetector.h index 6f2fada0e..419b9ed10 100644 --- 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 diff --git a/sdrbase/dsp/cwkeyer.h b/sdrbase/dsp/cwkeyer.h index 35e2399ab..a7d580964 100644 --- a/sdrbase/dsp/cwkeyer.h +++ b/sdrbase/dsp/cwkeyer.h @@ -21,7 +21,7 @@ #include #include -#include "util/export.h" +#include "export.h" #include "util/message.h" #include "cwkeyersettings.h" diff --git a/sdrbase/dsp/cwkeyersettings.h b/sdrbase/dsp/cwkeyersettings.h index d4a4d9d4a..5ebaf9401 100644 --- a/sdrbase/dsp/cwkeyersettings.h +++ b/sdrbase/dsp/cwkeyersettings.h @@ -21,7 +21,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRBASE_API CWKeyerSettings { diff --git a/sdrbase/dsp/decimatorsf.h b/sdrbase/dsp/decimatorsf.h index 751f39815..ba419fb40 100644 --- 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 diff --git a/sdrbase/dsp/devicesamplesink.h b/sdrbase/dsp/devicesamplesink.h index 5171f06ef..8ed05e8b2 100644 --- 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 { diff --git a/sdrbase/dsp/devicesamplesource.h b/sdrbase/dsp/devicesamplesource.h index 909c74a4b..8ee7604ba 100644 --- 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 { diff --git a/sdrbase/dsp/downchannelizer.h b/sdrbase/dsp/downchannelizer.h index b1dad6012..afecca973 100644 --- a/sdrbase/dsp/downchannelizer.h +++ b/sdrbase/dsp/downchannelizer.h @@ -21,7 +21,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" #include "util/message.h" #ifdef SDR_RX_SAMPLE_24BIT #include "dsp/inthalfbandfilterdb.h" diff --git a/sdrbase/dsp/dspcommands.h b/sdrbase/dsp/dspcommands.h index 49199098b..e354498a2 100644 --- a/sdrbase/dsp/dspcommands.h +++ b/sdrbase/dsp/dspcommands.h @@ -21,7 +21,7 @@ #include #include "util/message.h" #include "fftwindow.h" -#include "util/export.h" +#include "export.h" class DeviceSampleSource; class BasebandSampleSink; diff --git a/sdrbase/dsp/dspdevicesinkengine.h b/sdrbase/dsp/dspdevicesinkengine.h index f148df672..f97560c2d 100644 --- 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; diff --git a/sdrbase/dsp/dspdevicesourceengine.h b/sdrbase/dsp/dspdevicesourceengine.h index a71a3ebbc..053930fd0 100644 --- 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; diff --git a/sdrbase/dsp/dspengine.h b/sdrbase/dsp/dspengine.h index 43fe1bf28..b5aaa399f 100644 --- a/sdrbase/dsp/dspengine.h +++ b/sdrbase/dsp/dspengine.h @@ -24,7 +24,7 @@ #include #include "audio/audiooutput.h" #include "audio/audioinput.h" -#include "util/export.h" +#include "export.h" #ifdef DSD_USE_SERIALDV #include "dsp/dvserialengine.h" #endif diff --git a/sdrbase/dsp/dvserialengine.h b/sdrbase/dsp/dvserialengine.h index b5c50af09..6de8ace91 100644 --- a/sdrbase/dsp/dvserialengine.h +++ b/sdrbase/dsp/dvserialengine.h @@ -24,7 +24,7 @@ #include #include -#include "util/export.h" +#include "export.h" class QThread; class DVSerialWorker; diff --git a/sdrbase/dsp/dvserialworker.h b/sdrbase/dsp/dvserialworker.h index 72dac23ad..c9ecaaded 100644 --- 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" diff --git a/sdrbase/dsp/fftengine.h b/sdrbase/dsp/fftengine.h index abae57959..78028a8d5 100644 --- 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: diff --git a/sdrbase/dsp/fftfilt.h b/sdrbase/dsp/fftfilt.h index 2feabd9ce..b52d2bd83 100644 --- a/sdrbase/dsp/fftfilt.h +++ b/sdrbase/dsp/fftfilt.h @@ -7,7 +7,7 @@ #include #include "gfft.h" -#include "util/export.h" +#include "export.h" #undef M_PI #define M_PI 3.14159265358979323846 diff --git a/sdrbase/dsp/fftwengine.h b/sdrbase/dsp/fftwengine.h index 6000a7a7a..3d269aeb4 100644 --- a/sdrbase/dsp/fftwengine.h +++ b/sdrbase/dsp/fftwengine.h @@ -5,7 +5,7 @@ #include #include #include "dsp/fftengine.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API FFTWEngine : public FFTEngine { public: diff --git a/sdrbase/dsp/fftwindow.h b/sdrbase/dsp/fftwindow.h index cad15d052..4dece932e 100644 --- a/sdrbase/dsp/fftwindow.h +++ b/sdrbase/dsp/fftwindow.h @@ -22,7 +22,7 @@ #define _USE_MATH_DEFINES #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #undef M_PI #define M_PI 3.14159265358979323846 diff --git a/sdrbase/dsp/filerecord.h b/sdrbase/dsp/filerecord.h index ccb531a02..9272d07a7 100644 --- a/sdrbase/dsp/filerecord.h +++ b/sdrbase/dsp/filerecord.h @@ -7,7 +7,7 @@ #include #include -#include "util/export.h" +#include "export.h" class Message; diff --git a/sdrbase/dsp/filtermbe.h b/sdrbase/dsp/filtermbe.h index 9163e8523..a9ce75db3 100644 --- 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 { diff --git a/sdrbase/dsp/filterrc.h b/sdrbase/dsp/filterrc.h index 09da1cd64..1c4a574d1 100644 --- 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 diff --git a/sdrbase/dsp/hbfiltertraits.h b/sdrbase/dsp/hbfiltertraits.h index 8d1848944..5d3136604 100644 --- a/sdrbase/dsp/hbfiltertraits.h +++ b/sdrbase/dsp/hbfiltertraits.h @@ -19,7 +19,7 @@ #define SDRBASE_DSP_HBFILTERTRAITS_H_ #include -#include "util/export.h" +#include "export.h" // uses Q1.14 format internally, input and output are S16 diff --git a/sdrbase/dsp/interpolator.h b/sdrbase/dsp/interpolator.h index 11a979e48..607b3fe97 100644 --- a/sdrbase/dsp/interpolator.h +++ b/sdrbase/dsp/interpolator.h @@ -5,7 +5,7 @@ #include #endif #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include #ifndef __WINDOWS__ #include diff --git a/sdrbase/dsp/inthalfbandfilter.h b/sdrbase/dsp/inthalfbandfilter.h index 6b482d2b2..b51189344 100644 --- a/sdrbase/dsp/inthalfbandfilter.h +++ b/sdrbase/dsp/inthalfbandfilter.h @@ -21,7 +21,7 @@ #include #include "dsp/dsptypes.h" #include "dsp/hbfiltertraits.h" -#include "util/export.h" +#include "export.h" template class SDRBASE_API IntHalfbandFilter { diff --git a/sdrbase/dsp/inthalfbandfilterdb.h b/sdrbase/dsp/inthalfbandfilterdb.h index f3bb13f53..a4b00bd8f 100644 --- a/sdrbase/dsp/inthalfbandfilterdb.h +++ b/sdrbase/dsp/inthalfbandfilterdb.h @@ -24,7 +24,7 @@ #include #include "dsp/dsptypes.h" #include "dsp/hbfiltertraits.h" -#include "util/export.h" +#include "export.h" template class SDRBASE_API IntHalfbandFilterDB { diff --git a/sdrbase/dsp/inthalfbandfilterdbf.h b/sdrbase/dsp/inthalfbandfilterdbf.h index 9b40edc40..5dc7bad7a 100644 --- a/sdrbase/dsp/inthalfbandfilterdbf.h +++ b/sdrbase/dsp/inthalfbandfilterdbf.h @@ -24,7 +24,7 @@ #include #include "dsp/dsptypes.h" #include "dsp/hbfiltertraits.h" -#include "util/export.h" +#include "export.h" template class SDRBASE_API IntHalfbandFilterDBF { diff --git a/sdrbase/dsp/inthalfbandfiltereo1.h b/sdrbase/dsp/inthalfbandfiltereo1.h index 4d627bed6..e76f3a871 100644 --- 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 class SDRBASE_API IntHalfbandFilterEO1 { diff --git a/sdrbase/dsp/inthalfbandfilterst.h b/sdrbase/dsp/inthalfbandfilterst.h index 94336a4fd..b940675e0 100644 --- a/sdrbase/dsp/inthalfbandfilterst.h +++ b/sdrbase/dsp/inthalfbandfilterst.h @@ -25,7 +25,7 @@ #include "dsp/dsptypes.h" #include "dsp/hbfiltertraits.h" #include "dsp/inthalfbandfiltersti.h" -#include "util/export.h" +#include "export.h" template class SDRANGEL_API IntHalfbandFilterST { diff --git a/sdrbase/dsp/kissengine.h b/sdrbase/dsp/kissengine.h index 83d029745..0b8faba38 100644 --- a/sdrbase/dsp/kissengine.h +++ b/sdrbase/dsp/kissengine.h @@ -3,7 +3,7 @@ #include "dsp/fftengine.h" #include "dsp/kissfft.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API KissEngine : public FFTEngine { public: diff --git a/sdrbase/dsp/nco.h b/sdrbase/dsp/nco.h index 735a7f70a..cea728650 100644 --- a/sdrbase/dsp/nco.h +++ b/sdrbase/dsp/nco.h @@ -19,7 +19,7 @@ #define INCLUDE_NCO_H #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API NCO { private: diff --git a/sdrbase/dsp/ncof.h b/sdrbase/dsp/ncof.h index d07064e56..eee258242 100644 --- a/sdrbase/dsp/ncof.h +++ b/sdrbase/dsp/ncof.h @@ -18,7 +18,7 @@ #define INCLUDE_NCOF_H #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API NCOF { private: diff --git a/sdrbase/dsp/nullsink.h b/sdrbase/dsp/nullsink.h index 0bdbe76a2..2e26af373 100644 --- a/sdrbase/dsp/nullsink.h +++ b/sdrbase/dsp/nullsink.h @@ -2,7 +2,7 @@ #define INCLUDE_NULLSINK_H #include -#include "util/export.h" +#include "export.h" class Message; diff --git a/sdrbase/dsp/phaselock.h b/sdrbase/dsp/phaselock.h index 47e0ba692..06196c5e7 100644 --- a/sdrbase/dsp/phaselock.h +++ b/sdrbase/dsp/phaselock.h @@ -17,7 +17,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" /** Phase-locked loop mainly for broadcadt FM stereo pilot. */ class SDRBASE_API PhaseLock diff --git a/sdrbase/dsp/recursivefilters.h b/sdrbase/dsp/recursivefilters.h index 68f4b0448..1c457df22 100644 --- a/sdrbase/dsp/recursivefilters.h +++ b/sdrbase/dsp/recursivefilters.h @@ -17,7 +17,7 @@ #ifndef SDRBASE_DSP_RECURSIVEFILTERS_H_ #define SDRBASE_DSP_RECURSIVEFILTERS_H_ -#include "util/export.h" +#include "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. diff --git a/sdrbase/dsp/samplesinkfifo.h b/sdrbase/dsp/samplesinkfifo.h index cdead7be5..1855a6d40 100644 --- a/sdrbase/dsp/samplesinkfifo.h +++ b/sdrbase/dsp/samplesinkfifo.h @@ -22,7 +22,7 @@ #include #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API SampleSinkFifo : public QObject { Q_OBJECT diff --git a/sdrbase/dsp/samplesinkfifodoublebuffered.h b/sdrbase/dsp/samplesinkfifodoublebuffered.h index d7421e512..aa37ac0a4 100644 --- a/sdrbase/dsp/samplesinkfifodoublebuffered.h +++ b/sdrbase/dsp/samplesinkfifodoublebuffered.h @@ -21,7 +21,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" #include "dsp/dsptypes.h" class SDRBASE_API SampleSinkFifoDoubleBuffered : public QObject { diff --git a/sdrbase/dsp/samplesourcefifo.h b/sdrbase/dsp/samplesourcefifo.h index 0f4f2e108..f856a631f 100644 --- a/sdrbase/dsp/samplesourcefifo.h +++ b/sdrbase/dsp/samplesourcefifo.h @@ -21,7 +21,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" #include "dsp/dsptypes.h" class SDRBASE_API SampleSourceFifo : public QObject { diff --git a/sdrbase/dsp/threadedbasebandsamplesink.h b/sdrbase/dsp/threadedbasebandsamplesink.h index 727d03903..0cd72b9a2 100644 --- a/sdrbase/dsp/threadedbasebandsamplesink.h +++ b/sdrbase/dsp/threadedbasebandsamplesink.h @@ -23,7 +23,7 @@ #include "samplesinkfifo.h" #include "util/messagequeue.h" -#include "util/export.h" +#include "export.h" class BasebandSampleSink; class QThread; diff --git a/sdrbase/dsp/threadedbasebandsamplesource.h b/sdrbase/dsp/threadedbasebandsamplesource.h index e22673c97..0fa838516 100644 --- a/sdrbase/dsp/threadedbasebandsamplesource.h +++ b/sdrbase/dsp/threadedbasebandsamplesource.h @@ -22,7 +22,7 @@ #include "dsp/basebandsamplesource.h" #include "util/messagequeue.h" -#include "util/export.h" +#include "export.h" class BasebandSampleSource; class QThread; diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h index 5d16b2c00..63698f334 100644 --- a/sdrbase/dsp/upchannelizer.h +++ b/sdrbase/dsp/upchannelizer.h @@ -21,7 +21,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" #include "util/message.h" #ifdef USE_SSE4_1 #include "dsp/inthalfbandfiltereo1.h" diff --git a/sdrbase/dsp/wfir.h b/sdrbase/dsp/wfir.h index d01a46893..d0225cf83 100644 --- a/sdrbase/dsp/wfir.h +++ b/sdrbase/dsp/wfir.h @@ -53,7 +53,7 @@ #ifndef _WFIR_H_ #define _WFIR_H_ -#include "util/export.h" +#include "export.h" class SDRBASE_API WFIR { diff --git a/sdrbase/mainparser.h b/sdrbase/mainparser.h index 0112d3079..14c5921e0 100644 --- a/sdrbase/mainparser.h +++ b/sdrbase/mainparser.h @@ -21,7 +21,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRBASE_API MainParser { diff --git a/sdrbase/plugin/pluginapi.h b/sdrbase/plugin/pluginapi.h index 6e72ca989..3f9206014 100644 --- a/sdrbase/plugin/pluginapi.h +++ b/sdrbase/plugin/pluginapi.h @@ -4,7 +4,7 @@ #include #include -#include "util/export.h" +#include "export.h" #include "plugin/plugininterface.h" class QString; diff --git a/sdrbase/plugin/plugininstancegui.h b/sdrbase/plugin/plugininstancegui.h index af8ccc59f..22cb59512 100644 --- a/sdrbase/plugin/plugininstancegui.h +++ b/sdrbase/plugin/plugininstancegui.h @@ -5,7 +5,7 @@ #include #include -#include "util/export.h" +#include "export.h" class Message; class MessageQueue; diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 57dec2139..64d73793d 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -4,7 +4,7 @@ #include #include -#include "util/export.h" +#include "export.h" struct SDRBASE_API PluginDescriptor { // general plugin description diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index e202f5856..fafb25c34 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -9,7 +9,7 @@ #include "plugin/plugininterface.h" #include "plugin/pluginapi.h" -#include "util/export.h" +#include "export.h" class QComboBox; class QPluginLoader; diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index a2d0c640b..1a6c4d3b3 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -193,7 +193,7 @@ HEADERS += audio/audiodeviceinfo.h\ settings/mainsettings.h\ util/CRC64.h\ util/db.h\ - util/export.h\ + export.h\ util/message.h\ util/messagequeue.h\ util/prettyprint.h\ diff --git a/sdrbase/settings/mainsettings.h b/sdrbase/settings/mainsettings.h index 8734d81f5..b348462a4 100644 --- a/sdrbase/settings/mainsettings.h +++ b/sdrbase/settings/mainsettings.h @@ -5,7 +5,7 @@ #include "preferences.h" #include "preset.h" #include "audio/audiodeviceinfo.h" -#include "util/export.h" +#include "export.h" class Command; diff --git a/sdrbase/settings/preferences.h b/sdrbase/settings/preferences.h index ef7461ddb..5fef43012 100644 --- a/sdrbase/settings/preferences.h +++ b/sdrbase/settings/preferences.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRBASE_API Preferences { public: diff --git a/sdrbase/settings/preset.h b/sdrbase/settings/preset.h index 390fd63da..26be52469 100644 --- a/sdrbase/settings/preset.h +++ b/sdrbase/settings/preset.h @@ -5,7 +5,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRBASE_API Preset { public: diff --git a/sdrbase/util/CRC64.h b/sdrbase/util/CRC64.h index 26924252a..525efa626 100644 --- a/sdrbase/util/CRC64.h +++ b/sdrbase/util/CRC64.h @@ -19,7 +19,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRBASE_API CRC64 { diff --git a/sdrbase/util/db.h b/sdrbase/util/db.h index fb08bcc41..93ff09130 100644 --- a/sdrbase/util/db.h +++ b/sdrbase/util/db.h @@ -18,7 +18,7 @@ #define INCLUDE_UTIL_DB_H_ #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API CalcDb { diff --git a/sdrbase/util/fixedtraits.h b/sdrbase/util/fixedtraits.h index 85c1327d5..0a8f38c18 100644 --- a/sdrbase/util/fixedtraits.h +++ b/sdrbase/util/fixedtraits.h @@ -20,7 +20,7 @@ #include -#include "util/export.h" +#include "export.h" template class FixedTraits diff --git a/sdrbase/util/message.h b/sdrbase/util/message.h index bbdeca69a..9dbb99e1c 100644 --- a/sdrbase/util/message.h +++ b/sdrbase/util/message.h @@ -19,7 +19,7 @@ #define INCLUDE_MESSAGE_H #include -#include "util/export.h" +#include "export.h" class SDRBASE_API Message { public: diff --git a/sdrbase/util/messagequeue.h b/sdrbase/util/messagequeue.h index 1301a13e6..860be2a02 100644 --- a/sdrbase/util/messagequeue.h +++ b/sdrbase/util/messagequeue.h @@ -21,7 +21,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" class Message; diff --git a/sdrbase/util/prettyprint.h b/sdrbase/util/prettyprint.h index 74002f86f..056ceb7f4 100644 --- a/sdrbase/util/prettyprint.h +++ b/sdrbase/util/prettyprint.h @@ -19,7 +19,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRBASE_API EscapeColors { diff --git a/sdrbase/util/rtpsink.h b/sdrbase/util/rtpsink.h index 0c4666a88..9ef8afc3f 100644 --- a/sdrbase/util/rtpsink.h +++ b/sdrbase/util/rtpsink.h @@ -31,7 +31,7 @@ #include "rtpsessionparams.h" #include "rtperrors.h" -#include "util/export.h" +#include "export.h" class QUdpSocket; diff --git a/sdrbase/util/samplesourceserializer.h b/sdrbase/util/samplesourceserializer.h index c303b7f38..920789ede 100644 --- a/sdrbase/util/samplesourceserializer.h +++ b/sdrbase/util/samplesourceserializer.h @@ -18,7 +18,7 @@ #define INCLUDE_UTIL_SAMPLESOURCESERIALIZER_H_ #include "util/simpleserializer.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API SampleSourceSerializer { diff --git a/sdrbase/util/simpleserializer.h b/sdrbase/util/simpleserializer.h index 24a026856..ca303b29a 100644 --- a/sdrbase/util/simpleserializer.h +++ b/sdrbase/util/simpleserializer.h @@ -4,7 +4,7 @@ #include #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" class SDRBASE_API SimpleSerializer { public: diff --git a/sdrbase/util/spinlock.h b/sdrbase/util/spinlock.h index 969a511ac..974339f48 100644 --- a/sdrbase/util/spinlock.h +++ b/sdrbase/util/spinlock.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRBASE_API Spinlock { public: diff --git a/sdrbase/util/syncmessenger.h b/sdrbase/util/syncmessenger.h index 0c6ed44f8..55f9b0a58 100644 --- a/sdrbase/util/syncmessenger.h +++ b/sdrbase/util/syncmessenger.h @@ -22,7 +22,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" class Message; diff --git a/sdrbase/util/uid.h b/sdrbase/util/uid.h index d612e7e51..5884fa6df 100644 --- a/sdrbase/util/uid.h +++ b/sdrbase/util/uid.h @@ -21,7 +21,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRBASE_API UidCalculator { diff --git a/sdrbase/webapi/webapiadapterinterface.h b/sdrbase/webapi/webapiadapterinterface.h index a7dd4a5dc..6695cb33e 100644 --- a/sdrbase/webapi/webapiadapterinterface.h +++ b/sdrbase/webapi/webapiadapterinterface.h @@ -24,7 +24,7 @@ #include "SWGErrorResponse.h" -#include "util/export.h" +#include "export.h" namespace SWGSDRangel { diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h index f4730362c..42296a15d 100644 --- a/sdrbase/webapi/webapirequestmapper.h +++ b/sdrbase/webapi/webapirequestmapper.h @@ -27,7 +27,7 @@ #include "staticfilecontroller.h" #include "webapiadapterinterface.h" -#include "util/export.h" +#include "export.h" namespace SWGSDRangel { diff --git a/sdrbase/webapi/webapiserver.h b/sdrbase/webapi/webapiserver.h index 1ae21efc0..43f5814ab 100644 --- a/sdrbase/webapi/webapiserver.h +++ b/sdrbase/webapi/webapiserver.h @@ -19,7 +19,7 @@ #ifndef SDRBASE_WEBAPI_WEBAPISERVER_H_ #define SDRBASE_WEBAPI_WEBAPISERVER_H_ -#include "util/export.h" +#include "export.h" namespace qtwebapp { diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index d38118795..2b5b38030 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -20,7 +20,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SpectrumVis; class GLSpectrum; diff --git a/sdrgui/dsp/scopevis.h b/sdrgui/dsp/scopevis.h index 2520a4684..0c08e59bd 100644 --- a/sdrgui/dsp/scopevis.h +++ b/sdrgui/dsp/scopevis.h @@ -3,7 +3,7 @@ #include #include -#include "util/export.h" +#include "export.h" #include "util/message.h" class GLScope; diff --git a/sdrgui/dsp/scopevismulti.h b/sdrgui/dsp/scopevismulti.h index 28c42c43f..8f8447a59 100644 --- a/sdrgui/dsp/scopevismulti.h +++ b/sdrgui/dsp/scopevismulti.h @@ -30,7 +30,7 @@ #include #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" #include "util/messagequeue.h" #include "util/doublebuffer.h" diff --git a/sdrgui/dsp/scopevisng.h b/sdrgui/dsp/scopevisng.h index 1c723a9ad..dc5ba22bd 100644 --- a/sdrgui/dsp/scopevisng.h +++ b/sdrgui/dsp/scopevisng.h @@ -29,7 +29,7 @@ #include #include "dsp/dsptypes.h" #include "dsp/basebandsamplesink.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" #include "util/doublebuffer.h" diff --git a/sdrgui/dsp/scopevisxy.h b/sdrgui/dsp/scopevisxy.h index 6a70f508c..640b3e7bf 100644 --- a/sdrgui/dsp/scopevisxy.h +++ b/sdrgui/dsp/scopevisxy.h @@ -19,7 +19,7 @@ #define SDRGUI_DSP_SCOPEVISXY_H_ #include "dsp/basebandsamplesink.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" #include diff --git a/sdrgui/dsp/spectrumscopecombovis.h b/sdrgui/dsp/spectrumscopecombovis.h index c9b5ababc..6e7b6f612 100644 --- a/sdrgui/dsp/spectrumscopecombovis.h +++ b/sdrgui/dsp/spectrumscopecombovis.h @@ -4,7 +4,7 @@ #include #include "dsp/spectrumvis.h" #include "dsp/scopevis.h" -#include "util/export.h" +#include "export.h" class Message; diff --git a/sdrgui/dsp/spectrumscopengcombovis.h b/sdrgui/dsp/spectrumscopengcombovis.h index 822db1f25..24ee8ce37 100644 --- a/sdrgui/dsp/spectrumscopengcombovis.h +++ b/sdrgui/dsp/spectrumscopengcombovis.h @@ -4,7 +4,7 @@ #include #include "dsp/spectrumvis.h" #include "dsp/scopevisng.h" -#include "util/export.h" +#include "export.h" class Message; diff --git a/sdrgui/dsp/spectrumvis.h b/sdrgui/dsp/spectrumvis.h index 92abd42df..2a7279e8d 100644 --- a/sdrgui/dsp/spectrumvis.h +++ b/sdrgui/dsp/spectrumvis.h @@ -5,7 +5,7 @@ #include #include "dsp/fftengine.h" #include "dsp/fftwindow.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" class GLSpectrum; diff --git a/sdrgui/gui/aboutdialog.h b/sdrgui/gui/aboutdialog.h index 204eda624..acddff7d8 100644 --- a/sdrgui/gui/aboutdialog.h +++ b/sdrgui/gui/aboutdialog.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" namespace Ui { class AboutDialog; diff --git a/sdrgui/gui/addpresetdialog.h b/sdrgui/gui/addpresetdialog.h index 3f7abdebf..f3595aff2 100644 --- a/sdrgui/gui/addpresetdialog.h +++ b/sdrgui/gui/addpresetdialog.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" namespace Ui { class AddPresetDialog; diff --git a/sdrgui/gui/audiodialog.h b/sdrgui/gui/audiodialog.h index 1a2b54756..bd0c51022 100644 --- a/sdrgui/gui/audiodialog.h +++ b/sdrgui/gui/audiodialog.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" class AudioDeviceInfo; diff --git a/sdrgui/gui/basicchannelsettingsdialog.h b/sdrgui/gui/basicchannelsettingsdialog.h index 2185980f4..4276a4c23 100644 --- a/sdrgui/gui/basicchannelsettingsdialog.h +++ b/sdrgui/gui/basicchannelsettingsdialog.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" namespace Ui { class BasicChannelSettingsDialog; diff --git a/sdrgui/gui/buttonswitch.h b/sdrgui/gui/buttonswitch.h index d116b3e72..ef108438a 100644 --- a/sdrgui/gui/buttonswitch.h +++ b/sdrgui/gui/buttonswitch.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRGUI_API ButtonSwitch : public QToolButton { Q_OBJECT diff --git a/sdrgui/gui/channelwindow.h b/sdrgui/gui/channelwindow.h index 20c1521d0..2a3dd7566 100644 --- a/sdrgui/gui/channelwindow.h +++ b/sdrgui/gui/channelwindow.h @@ -3,7 +3,7 @@ #include -#include "util/export.h" +#include "export.h" class QBoxLayout; class QSpacerItem; diff --git a/sdrgui/gui/clickablelabel.h b/sdrgui/gui/clickablelabel.h index 41769c499..1c8bae13a 100644 --- a/sdrgui/gui/clickablelabel.h +++ b/sdrgui/gui/clickablelabel.h @@ -21,7 +21,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRGUI_API ClickableLabel : public QLabel { diff --git a/sdrgui/gui/colormapper.h b/sdrgui/gui/colormapper.h index 50cb93241..ff13244dd 100644 --- a/sdrgui/gui/colormapper.h +++ b/sdrgui/gui/colormapper.h @@ -10,7 +10,7 @@ #include #include #include -#include "util/export.h" +#include "export.h" class SDRGUI_API ColorMapper { diff --git a/sdrgui/gui/commanditem.h b/sdrgui/gui/commanditem.h index acf17398e..4cb56fa69 100644 --- a/sdrgui/gui/commanditem.h +++ b/sdrgui/gui/commanditem.h @@ -16,7 +16,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRGUI_API CommandItem : public QTreeWidgetItem { public: diff --git a/sdrgui/gui/commandkeyreceiver.h b/sdrgui/gui/commandkeyreceiver.h index 9b5ed3be6..27299aa6d 100644 --- a/sdrgui/gui/commandkeyreceiver.h +++ b/sdrgui/gui/commandkeyreceiver.h @@ -19,7 +19,7 @@ #include -#include "util/export.h" +#include "export.h" class QKeyEvent; diff --git a/sdrgui/gui/commandoutputdialog.h b/sdrgui/gui/commandoutputdialog.h index dc6f5e406..e702b9728 100644 --- a/sdrgui/gui/commandoutputdialog.h +++ b/sdrgui/gui/commandoutputdialog.h @@ -20,7 +20,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace Ui { class CommandOutputDialog; diff --git a/sdrgui/gui/cwkeyergui.h b/sdrgui/gui/cwkeyergui.h index d55d6982f..a9d273c5b 100644 --- a/sdrgui/gui/cwkeyergui.h +++ b/sdrgui/gui/cwkeyergui.h @@ -20,7 +20,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "settings/serializable.h" namespace Ui { diff --git a/sdrgui/gui/editcommanddialog.h b/sdrgui/gui/editcommanddialog.h index 4f957c1a3..4aa57e5b3 100644 --- a/sdrgui/gui/editcommanddialog.h +++ b/sdrgui/gui/editcommanddialog.h @@ -20,7 +20,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace Ui { class EditCommandDialog; diff --git a/sdrgui/gui/externalclockbutton.h b/sdrgui/gui/externalclockbutton.h index 98598b906..bb531b3f2 100644 --- a/sdrgui/gui/externalclockbutton.h +++ b/sdrgui/gui/externalclockbutton.h @@ -23,7 +23,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRGUI_API ExternalClockButton : public QPushButton { Q_OBJECT diff --git a/sdrgui/gui/externalclockdialog.h b/sdrgui/gui/externalclockdialog.h index f77d77387..76d4ebcef 100644 --- a/sdrgui/gui/externalclockdialog.h +++ b/sdrgui/gui/externalclockdialog.h @@ -23,7 +23,7 @@ #include -#include "util/export.h" +#include "export.h" namespace Ui { class ExternalClockDialog; diff --git a/sdrgui/gui/glscope.h b/sdrgui/gui/glscope.h index 558705823..6e0e1ce30 100644 --- a/sdrgui/gui/glscope.h +++ b/sdrgui/gui/glscope.h @@ -32,7 +32,7 @@ #include "gui/scaleengine.h" #include "gui/glshadersimple.h" #include "gui/glshadertextured.h" -#include "util/export.h" +#include "export.h" #include "util/bitfieldindex.h" #include "util/incrementalarray.h" diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h index 982f0bd3c..6b1c6d5aa 100644 --- a/sdrgui/gui/glscopegui.h +++ b/sdrgui/gui/glscopegui.h @@ -3,7 +3,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" #include "dsp/scopevis.h" #include "settings/serializable.h" diff --git a/sdrgui/gui/glscopemulti.h b/sdrgui/gui/glscopemulti.h index 5a3cac400..4991b48eb 100644 --- a/sdrgui/gui/glscopemulti.h +++ b/sdrgui/gui/glscopemulti.h @@ -29,7 +29,7 @@ #include "gui/scaleengine.h" #include "gui/glshadersimple.h" #include "gui/glshadertextured.h" -#include "util/export.h" +#include "export.h" #include "util/bitfieldindex.h" #include "util/incrementalarray.h" diff --git a/sdrgui/gui/glscopemultigui.h b/sdrgui/gui/glscopemultigui.h index cdae7726f..291d1ca9b 100644 --- a/sdrgui/gui/glscopemultigui.h +++ b/sdrgui/gui/glscopemultigui.h @@ -22,7 +22,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" #include "dsp/scopevismulti.h" diff --git a/sdrgui/gui/glscopeng.h b/sdrgui/gui/glscopeng.h index 317ddb522..929afe5b4 100644 --- a/sdrgui/gui/glscopeng.h +++ b/sdrgui/gui/glscopeng.h @@ -29,7 +29,7 @@ #include "gui/scaleengine.h" #include "gui/glshadersimple.h" #include "gui/glshadertextured.h" -#include "util/export.h" +#include "export.h" #include "util/bitfieldindex.h" #include "util/incrementalarray.h" diff --git a/sdrgui/gui/glscopenggui.h b/sdrgui/gui/glscopenggui.h index f82d9f90b..43f6ad660 100644 --- a/sdrgui/gui/glscopenggui.h +++ b/sdrgui/gui/glscopenggui.h @@ -22,7 +22,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "util/message.h" #include "dsp/scopevisng.h" #include "settings/serializable.h" diff --git a/sdrgui/gui/glshadersimple.h b/sdrgui/gui/glshadersimple.h index 929d17f03..583e95c15 100644 --- a/sdrgui/gui/glshadersimple.h +++ b/sdrgui/gui/glshadersimple.h @@ -21,7 +21,7 @@ #include #include -#include "util/export.h" +#include "export.h" class QOpenGLShaderProgram; class QMatrix4x4; diff --git a/sdrgui/gui/glshadertextured.h b/sdrgui/gui/glshadertextured.h index 59d411fdd..dbbb92ae5 100644 --- a/sdrgui/gui/glshadertextured.h +++ b/sdrgui/gui/glshadertextured.h @@ -25,7 +25,7 @@ #include #include -#include "util/export.h" +#include "export.h" class QOpenGLShaderProgram; class QMatrix4x4; diff --git a/sdrgui/gui/glspectrum.h b/sdrgui/gui/glspectrum.h index 57c7a7456..3b2ef97ac 100644 --- a/sdrgui/gui/glspectrum.h +++ b/sdrgui/gui/glspectrum.h @@ -32,7 +32,7 @@ #include "gui/glshadersimple.h" #include "gui/glshadertextured.h" #include "dsp/channelmarker.h" -#include "util/export.h" +#include "export.h" #include "util/incrementalarray.h" class QOpenGLShaderProgram; diff --git a/sdrgui/gui/glspectrumgui.h b/sdrgui/gui/glspectrumgui.h index 3ee2cf481..69765777e 100644 --- a/sdrgui/gui/glspectrumgui.h +++ b/sdrgui/gui/glspectrumgui.h @@ -3,7 +3,7 @@ #include #include "dsp/dsptypes.h" -#include "util/export.h" +#include "export.h" #include "settings/serializable.h" namespace Ui { diff --git a/sdrgui/gui/indicator.h b/sdrgui/gui/indicator.h index ee9aa75f9..ba5cfe896 100644 --- a/sdrgui/gui/indicator.h +++ b/sdrgui/gui/indicator.h @@ -19,7 +19,7 @@ #define INCLUDE_INDICATOR_H #include -#include "util/export.h" +#include "export.h" class SDRGUI_API Indicator : public QWidget { private: diff --git a/sdrgui/gui/levelmeter.h b/sdrgui/gui/levelmeter.h index e7f6084ca..e4927e68d 100644 --- a/sdrgui/gui/levelmeter.h +++ b/sdrgui/gui/levelmeter.h @@ -52,7 +52,7 @@ #include "dsp/dsptypes.h" #include "gui/scaleengine.h" -#include "util/export.h" +#include "export.h" /** * Widget which displays a vertical audio level meter, indicating the diff --git a/sdrgui/gui/loggingdialog.h b/sdrgui/gui/loggingdialog.h index e5e016f2b..93b54c777 100644 --- a/sdrgui/gui/loggingdialog.h +++ b/sdrgui/gui/loggingdialog.h @@ -20,7 +20,7 @@ #include #include "settings/mainsettings.h" -#include "util/export.h" +#include "export.h" namespace Ui { class LoggingDialog; diff --git a/sdrgui/gui/mypositiondialog.h b/sdrgui/gui/mypositiondialog.h index c4f834f76..29f152482 100644 --- a/sdrgui/gui/mypositiondialog.h +++ b/sdrgui/gui/mypositiondialog.h @@ -23,7 +23,7 @@ #include #include "settings/mainsettings.h" -#include "util/export.h" +#include "export.h" namespace Ui { class MyPositionDialog; diff --git a/sdrgui/gui/pluginsdialog.h b/sdrgui/gui/pluginsdialog.h index 591d51127..ef1b7439a 100644 --- a/sdrgui/gui/pluginsdialog.h +++ b/sdrgui/gui/pluginsdialog.h @@ -3,7 +3,7 @@ #include #include "plugin/pluginmanager.h" -#include "util/export.h" +#include "export.h" namespace Ui { class PluginsDialog; diff --git a/sdrgui/gui/presetitem.h b/sdrgui/gui/presetitem.h index 8735b071f..ad011f546 100644 --- a/sdrgui/gui/presetitem.h +++ b/sdrgui/gui/presetitem.h @@ -17,7 +17,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRGUI_API PresetItem : public QTreeWidgetItem { public: diff --git a/sdrgui/gui/rollupwidget.h b/sdrgui/gui/rollupwidget.h index d5f746b08..377a32058 100644 --- a/sdrgui/gui/rollupwidget.h +++ b/sdrgui/gui/rollupwidget.h @@ -2,7 +2,7 @@ #define INCLUDE_ROLLUPWIDGET_H #include -#include "util/export.h" +#include "export.h" class SDRGUI_API RollupWidget : public QWidget { Q_OBJECT diff --git a/sdrgui/gui/samplingdevicecontrol.h b/sdrgui/gui/samplingdevicecontrol.h index 260ad9cc1..b491755f2 100644 --- a/sdrgui/gui/samplingdevicecontrol.h +++ b/sdrgui/gui/samplingdevicecontrol.h @@ -22,7 +22,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace Ui { class SamplingDeviceControl; diff --git a/sdrgui/gui/samplingdevicedialog.h b/sdrgui/gui/samplingdevicedialog.h index 059a1ac51..590fcf7d0 100644 --- a/sdrgui/gui/samplingdevicedialog.h +++ b/sdrgui/gui/samplingdevicedialog.h @@ -24,7 +24,7 @@ #include #include -#include "util/export.h" +#include "export.h" namespace Ui { class SamplingDeviceDialog; diff --git a/sdrgui/gui/scaleengine.h b/sdrgui/gui/scaleengine.h index 41874d1f4..cdfde9c3b 100644 --- a/sdrgui/gui/scaleengine.h +++ b/sdrgui/gui/scaleengine.h @@ -22,7 +22,7 @@ #include #include #include "physicalunit.h" -#include "util/export.h" +#include "export.h" class SDRGUI_API ScaleEngine { public: diff --git a/sdrgui/gui/tickedslider.h b/sdrgui/gui/tickedslider.h index 67b33b2d5..b788011e4 100644 --- a/sdrgui/gui/tickedslider.h +++ b/sdrgui/gui/tickedslider.h @@ -22,7 +22,7 @@ #include #include -#include "util/export.h" +#include "export.h" class SDRGUI_API TickedSlider : public QSlider { diff --git a/sdrgui/gui/transverterbutton.h b/sdrgui/gui/transverterbutton.h index c4b19a9fc..09ec2d607 100644 --- a/sdrgui/gui/transverterbutton.h +++ b/sdrgui/gui/transverterbutton.h @@ -23,7 +23,7 @@ #include -#include "util/export.h" +#include "export.h" class SDRGUI_API TransverterButton : public QPushButton { Q_OBJECT diff --git a/sdrgui/gui/transverterdialog.h b/sdrgui/gui/transverterdialog.h index 892f0c058..3baf7eb6b 100644 --- a/sdrgui/gui/transverterdialog.h +++ b/sdrgui/gui/transverterdialog.h @@ -23,7 +23,7 @@ #include -#include "util/export.h" +#include "export.h" namespace Ui { class TransverterDialog; diff --git a/sdrgui/gui/tvscreen.h b/sdrgui/gui/tvscreen.h index c9969a475..54a383e03 100644 --- a/sdrgui/gui/tvscreen.h +++ b/sdrgui/gui/tvscreen.h @@ -30,7 +30,7 @@ #include "dsp/dsptypes.h" #include "glshadertextured.h" #include "glshadertvarray.h" -#include "util/export.h" +#include "export.h" #include "util/bitfieldindex.h" class QPainter; diff --git a/sdrgui/gui/valuedial.h b/sdrgui/gui/valuedial.h index 6c9e020bf..c752269cc 100644 --- a/sdrgui/gui/valuedial.h +++ b/sdrgui/gui/valuedial.h @@ -18,7 +18,7 @@ #include #include #include "gui/colormapper.h" -#include "util/export.h" +#include "export.h" class SDRGUI_API ValueDial : public QWidget { Q_OBJECT diff --git a/sdrgui/gui/valuedialz.h b/sdrgui/gui/valuedialz.h index c313d550f..26a8625c1 100644 --- a/sdrgui/gui/valuedialz.h +++ b/sdrgui/gui/valuedialz.h @@ -21,7 +21,7 @@ #include #include #include "gui/colormapper.h" -#include "util/export.h" +#include "export.h" class SDRGUI_API ValueDialZ : public QWidget { Q_OBJECT diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index b4785d5c7..11700ffd0 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -25,7 +25,7 @@ #include "settings/mainsettings.h" #include "util/message.h" #include "util/messagequeue.h" -#include "util/export.h" +#include "export.h" #include "mainparser.h" class QLabel; diff --git a/sdrgui/webapi/webapiadaptergui.h b/sdrgui/webapi/webapiadaptergui.h index 7edc56a98..c2200e021 100644 --- a/sdrgui/webapi/webapiadaptergui.h +++ b/sdrgui/webapi/webapiadaptergui.h @@ -22,7 +22,7 @@ #include #include "webapi/webapiadapterinterface.h" -#include "util/export.h" +#include "export.h" class MainWindow; diff --git a/sdrsrv/maincore.h b/sdrsrv/maincore.h index 34841682e..3b8b6d1b2 100644 --- a/sdrsrv/maincore.h +++ b/sdrsrv/maincore.h @@ -25,7 +25,7 @@ #include "settings/mainsettings.h" #include "util/message.h" #include "util/messagequeue.h" -#include "util/export.h" +#include "export.h" #include "mainparser.h" class AudioDeviceInfo;