From a089d3641d5464b1de04de8c0752a17c9f6de544 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 10 Apr 2015 21:51:07 +0200 Subject: [PATCH] refs #403 add BlackMisc shared library build --- src/blackmisc/audio/audiodeviceinfo.h | 3 +- src/blackmisc/audio/audiodeviceinfolist.h | 3 +- src/blackmisc/audio/voiceroom.h | 3 +- src/blackmisc/audio/voiceroomlist.h | 3 +- src/blackmisc/aviation/adfsystem.h | 3 +- src/blackmisc/aviation/aircraft.h | 3 +- src/blackmisc/aviation/aircraftengine.h | 3 +- src/blackmisc/aviation/aircraftenginelist.h | 3 +- src/blackmisc/aviation/aircrafticao.h | 3 +- src/blackmisc/aviation/aircraftlights.h | 3 +- src/blackmisc/aviation/aircraftlist.h | 3 +- src/blackmisc/aviation/aircraftparts.h | 3 +- src/blackmisc/aviation/aircraftpartslist.h | 3 +- src/blackmisc/aviation/aircraftsituation.h | 3 +- .../aviation/aircraftsituationlist.h | 3 +- src/blackmisc/aviation/airport.h | 3 +- src/blackmisc/aviation/airporticao.h | 3 +- src/blackmisc/aviation/airportlist.h | 3 +- src/blackmisc/aviation/altitude.h | 3 +- src/blackmisc/aviation/atcstation.h | 3 +- src/blackmisc/aviation/atcstationlist.h | 3 +- src/blackmisc/aviation/avionicsbase.h | 3 +- src/blackmisc/aviation/callsign.h | 3 +- src/blackmisc/aviation/callsignset.h | 3 +- src/blackmisc/aviation/comsystem.h | 3 +- src/blackmisc/aviation/flightplan.h | 3 +- src/blackmisc/aviation/heading.h | 3 +- src/blackmisc/aviation/informationmessage.h | 3 +- src/blackmisc/aviation/navsystem.h | 3 +- src/blackmisc/aviation/selcal.h | 3 +- src/blackmisc/aviation/track.h | 3 +- src/blackmisc/aviation/transponder.h | 3 +- src/blackmisc/blackmisc.pro | 2 +- src/blackmisc/blackmiscexport.h | 27 +++++++ src/blackmisc/blackmiscfreefunctions.h | 55 +++++++------- src/blackmisc/digestsignal.h | 3 +- src/blackmisc/eveventhotkeyfunction.h | 3 +- src/blackmisc/evoriginator.h | 3 +- src/blackmisc/filedeleter.h | 3 +- src/blackmisc/geo/coordinategeodetic.h | 11 +-- src/blackmisc/geo/latitude.h | 3 +- src/blackmisc/geo/longitude.h | 3 +- src/blackmisc/hardware/joystickbutton.h | 3 +- src/blackmisc/hardware/keyboardkey.h | 3 +- src/blackmisc/hardware/keyboardkeylist.h | 3 +- src/blackmisc/hotkeyfunction.h | 3 +- src/blackmisc/icon.h | 3 +- src/blackmisc/iconlist.h | 3 +- src/blackmisc/icons.h | 3 +- src/blackmisc/json.h | 73 ++++++++++--------- src/blackmisc/logcategory.h | 3 +- src/blackmisc/logcategorylist.h | 3 +- src/blackmisc/loghandler.h | 7 +- src/blackmisc/logmessage.h | 5 +- src/blackmisc/logpattern.h | 3 +- src/blackmisc/math/mathutils.h | 3 +- src/blackmisc/namevariantpair.h | 3 +- src/blackmisc/namevariantpairlist.h | 3 +- src/blackmisc/network/aircraftmapping.h | 3 +- src/blackmisc/network/aircraftmappinglist.h | 3 +- src/blackmisc/network/client.h | 3 +- src/blackmisc/network/clientlist.h | 3 +- src/blackmisc/network/server.h | 3 +- src/blackmisc/network/serverlist.h | 3 +- src/blackmisc/network/textmessage.h | 3 +- src/blackmisc/network/textmessagelist.h | 3 +- src/blackmisc/network/user.h | 3 +- src/blackmisc/network/userlist.h | 3 +- src/blackmisc/network/voicecapabilities.h | 3 +- src/blackmisc/networkutils.h | 3 +- src/blackmisc/pixmap.h | 3 +- src/blackmisc/pq/acceleration.h | 3 +- src/blackmisc/pq/angle.h | 3 +- src/blackmisc/pq/constants.h | 3 +- src/blackmisc/pq/frequency.h | 3 +- src/blackmisc/pq/length.h | 3 +- src/blackmisc/pq/mass.h | 3 +- src/blackmisc/pq/measurementunit.h | 3 +- src/blackmisc/pq/pqstring.h | 3 +- src/blackmisc/pq/pressure.h | 3 +- src/blackmisc/pq/speed.h | 3 +- src/blackmisc/pq/temperature.h | 3 +- src/blackmisc/pq/time.h | 3 +- src/blackmisc/pq/units.h | 19 ++--- src/blackmisc/project.h | 3 +- src/blackmisc/propertyindex.h | 3 +- src/blackmisc/propertyindexlist.h | 3 +- src/blackmisc/propertyindexvariantmap.h | 16 ++-- src/blackmisc/range.h | 1 + src/blackmisc/sampleutils.h | 3 +- src/blackmisc/setaudio.h | 3 +- src/blackmisc/setkeyboardhotkey.h | 3 +- src/blackmisc/setkeyboardhotkeylist.h | 3 +- src/blackmisc/setnetwork.h | 3 +- src/blackmisc/settingutilities.h | 3 +- src/blackmisc/simplecommandparser.h | 3 +- src/blackmisc/simulation/aircraftmodel.h | 3 +- src/blackmisc/simulation/aircraftmodellist.h | 3 +- .../simulation/fscommon/aircraftcfgentries.h | 3 +- .../fscommon/aircraftcfgentrieslist.h | 3 +- .../simulation/fscommon/aircraftmapper.h | 3 +- .../simulation/fscommon/bcdconversions.h | 3 +- .../simulation/fscommon/fscommonutil.h | 3 +- .../simulation/fscommon/vpilotmodelmappings.h | 3 +- .../simulation/fsx/fsxsimulatorsetup.h | 3 +- .../simulation/fsx/simconnectutilities.h | 3 +- .../simulation/ownaircraftprovider.h | 11 +-- .../simulation/remoteaircraftprovider.h | 9 ++- .../simulation/remoteaircraftproviderdummy.h | 3 +- src/blackmisc/simulation/setsimulator.h | 3 +- src/blackmisc/simulation/simulatedaircraft.h | 3 +- .../simulation/simulatedaircraftlist.h | 3 +- src/blackmisc/simulation/simulatorinfolist.h | 3 +- .../simulation/simulatormodelmappings.h | 3 +- .../simulation/simulatorplugininfo.h | 3 +- src/blackmisc/simulation/simulatorsetup.h | 3 +- src/blackmisc/statusmessage.h | 3 +- src/blackmisc/statusmessagelist.h | 3 +- src/blackmisc/testing.h | 3 +- src/blackmisc/threadedreader.h | 3 +- src/blackmisc/timestampbased.h | 3 +- src/blackmisc/tuple.h | 4 +- src/blackmisc/valueobject.h | 3 +- src/blackmisc/valueobject_private.h | 3 +- src/blackmisc/variant.h | 3 +- src/blackmisc/variantlist.h | 3 +- src/blackmisc/worker.h | 11 +-- 127 files changed, 372 insertions(+), 218 deletions(-) create mode 100644 src/blackmisc/blackmiscexport.h diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h index 0c21c0345..a017cc8e1 100644 --- a/src/blackmisc/audio/audiodeviceinfo.h +++ b/src/blackmisc/audio/audiodeviceinfo.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AUDIO_AUDIODEVICE_H #define BLACKMISC_AUDIO_AUDIODEVICE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/valueobject.h" #include @@ -25,7 +26,7 @@ namespace BlackMisc * If you want to safe this object, use the name instead of the index, since the index can change after * a restart. */ - class CAudioDeviceInfo : public CValueObject + class BLACKMISC_EXPORT CAudioDeviceInfo : public CValueObject { public: //! Type diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h index ccb685cb6..5d5e22f31 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.h +++ b/src/blackmisc/audio/audiodeviceinfolist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AUDIO_AUDIODEVICELIST_H #define BLACKMISC_AUDIO_AUDIODEVICELIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/audio/audiodeviceinfo.h" #include "blackmisc/sequence.h" #include "blackmisc/collection.h" @@ -24,7 +25,7 @@ namespace BlackMisc namespace Audio { //! Value object encapsulating a list of audio devices. - class CAudioDeviceInfoList : public CSequence + class BLACKMISC_EXPORT CAudioDeviceInfoList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/audio/voiceroom.h b/src/blackmisc/audio/voiceroom.h index 06f2afe0b..a107530cf 100644 --- a/src/blackmisc/audio/voiceroom.h +++ b/src/blackmisc/audio/voiceroom.h @@ -9,6 +9,7 @@ //! \file +#include "blackmisc/blackmiscexport.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" #include @@ -21,7 +22,7 @@ namespace BlackMisc namespace Audio { //! Value object encapsulating information of a voice room - class CVoiceRoom : public CValueObject + class BLACKMISC_EXPORT CVoiceRoom : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/audio/voiceroomlist.h b/src/blackmisc/audio/voiceroomlist.h index 30fa3e0c7..03444b821 100644 --- a/src/blackmisc/audio/voiceroomlist.h +++ b/src/blackmisc/audio/voiceroomlist.h @@ -13,6 +13,7 @@ #define BLACKMISC_AUDIO_VOICEROOMLIST_H #include "voiceroom.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" #include "blackmisc/collection.h" #include @@ -26,7 +27,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of voice rooms. */ - class CVoiceRoomList : public CSequence + class BLACKMISC_EXPORT CVoiceRoomList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/aviation/adfsystem.h b/src/blackmisc/aviation/adfsystem.h index 06170985b..5bd71a48c 100644 --- a/src/blackmisc/aviation/adfsystem.h +++ b/src/blackmisc/aviation/adfsystem.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_ADFSYSTEM_H #define BLACKMISC_AVIATION_ADFSYSTEM_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/modulator.h" #include @@ -35,7 +36,7 @@ namespace BlackMisc { //! ADF system ("for NDBs") - class CAdfSystem : public CValueObject> + class BLACKMISC_EXPORT CAdfSystem : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/aviation/aircraft.h b/src/blackmisc/aviation/aircraft.h index 0118094b8..01e1f139b 100644 --- a/src/blackmisc/aviation/aircraft.h +++ b/src/blackmisc/aviation/aircraft.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFT_H #define BLACKMISC_AVIATION_AIRCRAFT_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/user.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/aircrafticao.h" @@ -30,7 +31,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information of an aircraft - class CAircraft : + class BLACKMISC_EXPORT CAircraft : public CValueObject, public BlackMisc::Geo::ICoordinateWithRelativePosition { diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h index 8618ef645..c57086d96 100644 --- a/src/blackmisc/aviation/aircraftengine.h +++ b/src/blackmisc/aviation/aircraftengine.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTENGINES_H #define BLACKMISC_AVIATION_AIRCRAFTENGINES_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" namespace BlackMisc @@ -19,7 +20,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information about aircraft's engines - class CAircraftEngine : public CValueObject + class BLACKMISC_EXPORT CAircraftEngine : public CValueObject { public: diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h index 3526a5153..a3cfa2f2f 100644 --- a/src/blackmisc/aviation/aircraftenginelist.h +++ b/src/blackmisc/aviation/aircraftenginelist.h @@ -13,6 +13,7 @@ #define BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H #include "aircraftengine.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" #include @@ -22,7 +23,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating a list of aircraft engines. - class CAircraftEngineList : public CSequence + class BLACKMISC_EXPORT CAircraftEngineList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/aviation/aircrafticao.h b/src/blackmisc/aviation/aircrafticao.h index 1fd529851..d0ea1db00 100644 --- a/src/blackmisc/aviation/aircrafticao.h +++ b/src/blackmisc/aviation/aircrafticao.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTICAO_H #define BLACKMISC_AVIATION_AIRCRAFTICAO_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -20,7 +21,7 @@ namespace BlackMisc namespace Aviation { //! Value object for ICAO classification - class CAircraftIcao : public CValueObject + class BLACKMISC_EXPORT CAircraftIcao : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h index fb2eb1c91..72d378e1f 100644 --- a/src/blackmisc/aviation/aircraftlights.h +++ b/src/blackmisc/aviation/aircraftlights.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H #define BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/propertyindex.h" @@ -20,7 +21,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information about aircraft's lights - class CAircraftLights : public CValueObject + class BLACKMISC_EXPORT CAircraftLights : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/aviation/aircraftlist.h b/src/blackmisc/aviation/aircraftlist.h index c490ed103..c22f4703b 100644 --- a/src/blackmisc/aviation/aircraftlist.h +++ b/src/blackmisc/aviation/aircraftlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTLIST_H #define BLACKMISC_AVIATION_AIRCRAFTLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/callsignobjectlist.h" @@ -28,7 +29,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating a list of aircraft. - class CAircraftList : + class BLACKMISC_EXPORT CAircraftList : public CSequence, public ICallsignObjectList, public BlackMisc::Geo::IGeoObjectWithRelativePositionList diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index a0dc3a253..d40d17c16 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTS_H #define BLACKMISC_AVIATION_AIRCRAFTPARTS_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/valueobject.h" #include "blackmisc/timestampbased.h" @@ -24,7 +25,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information of aircraft's parts - class CAircraftParts : + class BLACKMISC_EXPORT CAircraftParts : public CValueObject, public BlackMisc::ITimestampBased { diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index 09550e25e..7324713c1 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H #define BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H +#include "blackmisc/blackmiscexport.h" #include "aircraftparts.h" #include "blackmisc/timestampobjectlist.h" #include "blackmisc/aviation/callsignobjectlist.h" @@ -22,7 +23,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating a list of aircraft parts. - class CAircraftPartsList : + class BLACKMISC_EXPORT CAircraftPartsList : public CSequence, public ITimestampObjectList, public ICallsignObjectList diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index 8672a5c7e..125c09977 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATION_H #define BLACKMISC_AVIATION_AIRCRAFTSITUATION_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/timestampbased.h" #include "blackmisc/aviation/altitude.h" @@ -26,7 +27,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information of an aircraft's situation - class CAircraftSituation : + class BLACKMISC_EXPORT CAircraftSituation : public CValueObject, public Geo::ICoordinateGeodetic, public BlackMisc::ITimestampBased { diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index 144233c18..174761937 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H #define BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/timestampobjectlist.h" #include "blackmisc/aviation/callsignobjectlist.h" @@ -22,7 +23,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating a list of aircraft situations - class CAircraftSituationList : + class BLACKMISC_EXPORT CAircraftSituationList : public CSequence, public ITimestampObjectList, public ICallsignObjectList diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h index 9ffcc6226..69d0d89db 100644 --- a/src/blackmisc/aviation/airport.h +++ b/src/blackmisc/aviation/airport.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRPORT_H #define BLACKMISC_AVIATION_AIRPORT_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/airporticao.h" #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/propertyindex.h" @@ -21,7 +22,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information about an airpot. - class CAirport : public CValueObject, public Geo::ICoordinateWithRelativePosition + class BLACKMISC_EXPORT CAirport : public CValueObject, public Geo::ICoordinateWithRelativePosition { public: //! Properties by index diff --git a/src/blackmisc/aviation/airporticao.h b/src/blackmisc/aviation/airporticao.h index d0fe6c746..2ea38c760 100644 --- a/src/blackmisc/aviation/airporticao.h +++ b/src/blackmisc/aviation/airporticao.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRPORTICAO_H #define BLACKMISC_AVIATION_AIRPORTICAO_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -20,7 +21,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information of a callsign. - class CAirportIcao : public CValueObject + class BLACKMISC_EXPORT CAirportIcao : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index a84e598fc..0b456d3e9 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_AIRPORTLIST_H #define BLACKMISC_AVIATION_AIRPORTLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/airport.h" #include "blackmisc/geo/geoobjectlist.h" #include "blackmisc/collection.h" @@ -26,7 +27,7 @@ namespace BlackMisc namespace Aviation { //! Value object for a list of airports. - class CAirportList : + class BLACKMISC_EXPORT CAirportList : public CSequence, public BlackMisc::Geo::IGeoObjectWithRelativePositionList { diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index c50ab5741..4d5831a6d 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_ALTITUDE_H #define BLACKMISC_AVIATION_ALTITUDE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/length.h" namespace BlackMisc @@ -34,7 +35,7 @@ namespace BlackMisc * Altitude as used in aviation, can be AGL or MSL altitude * \remarks Intentionally allowing +/- CLength , and >= / <= CLength. */ - class CAltitude : public CValueObject + class BLACKMISC_EXPORT CAltitude : public CValueObject { public: /*! diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index 0e8d6e0cf..b52e9c152 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_ATCSTATION_H #define BLACKMISC_AVIATION_ATCSTATION_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/audio/voiceroom.h" #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/informationmessage.h" @@ -30,7 +31,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information about an ATC station. - class CAtcStation : public CValueObject, public Geo::ICoordinateWithRelativePosition + class BLACKMISC_EXPORT CAtcStation : public CValueObject, public Geo::ICoordinateWithRelativePosition { public: //! Properties by index diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 3366ced69..22ea83ae2 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_ATCSTATIONLIST_H #define BLACKMISC_AVIATION_ATCSTATIONLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/geoobjectlist.h" #include "blackmisc/network/userlist.h" #include "blackmisc/aviation/atcstation.h" @@ -27,7 +28,7 @@ namespace BlackMisc namespace Aviation { //! Value object for a list of ATC stations. - class CAtcStationList : + class BLACKMISC_EXPORT CAtcStationList : public CSequence, public BlackMisc::Aviation::ICallsignObjectList, public BlackMisc::Geo::IGeoObjectWithRelativePositionList diff --git a/src/blackmisc/aviation/avionicsbase.h b/src/blackmisc/aviation/avionicsbase.h index a939fb9b2..5688c394a 100644 --- a/src/blackmisc/aviation/avionicsbase.h +++ b/src/blackmisc/aviation/avionicsbase.h @@ -8,6 +8,7 @@ //! \file +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/pq/constants.h" #include @@ -27,7 +28,7 @@ namespace BlackMisc { //! Base class for avionics - class CAvionicsBase : public CValueObject + class BLACKMISC_EXPORT CAvionicsBase : public CValueObject { protected: QString m_name; //!< name of the unit diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h index 572a7b032..d41c527a2 100644 --- a/src/blackmisc/aviation/callsign.h +++ b/src/blackmisc/aviation/callsign.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_CALLSIGN_H #define BLACKMISC_AVIATION_CALLSIGN_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/propertyindex.h" #include "blackmisc/icon.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -21,7 +22,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information of a callsign. - class CCallsign : public CValueObject + class BLACKMISC_EXPORT CCallsign : public CValueObject { public: //! Indexes diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index 200cad32e..fd568c3cb 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_CALLSIGNSET_H #define BLACKMISC_AVIATION_CALLSIGNSET_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" @@ -22,7 +23,7 @@ namespace BlackMisc namespace Aviation { //! Value object for a set of callsigns. - class CCallsignSet : public CCollection + class BLACKMISC_EXPORT CCallsignSet : public CCollection { public: //! Default constructor. diff --git a/src/blackmisc/aviation/comsystem.h b/src/blackmisc/aviation/comsystem.h index dc843ba90..6936c3f62 100644 --- a/src/blackmisc/aviation/comsystem.h +++ b/src/blackmisc/aviation/comsystem.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_COMSYSTEM_H #define BLACKMISC_AVIATION_COMSYSTEM_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/modulator.h" namespace BlackMisc @@ -32,7 +33,7 @@ namespace BlackMisc namespace Aviation { //! COM system (aka "radio") - class CComSystem : public CValueObject> + class BLACKMISC_EXPORT CComSystem : public CValueObject> { public: //! Channel spacing frequency diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index d7cf971b4..23bdcd11b 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H #define BLACKMISC_AVIATION_FLIGHTPLAN_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/aviation/altitude.h" #include "blackmisc/aviation/airporticao.h" @@ -24,7 +25,7 @@ namespace BlackMisc namespace Aviation { //! Value object for a flight plan - class CFlightPlan : public CValueObject + class BLACKMISC_EXPORT CFlightPlan : public CValueObject { public: //! Flight rules (VFR or IFR) diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h index 2cf953e74..0712cb6bd 100644 --- a/src/blackmisc/aviation/heading.h +++ b/src/blackmisc/aviation/heading.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_HEADING_H #define BLACKMISC_AVIATION_HEADING_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/angle.h" namespace BlackMisc @@ -34,7 +35,7 @@ namespace BlackMisc * \brief Heading as used in aviation, can be true or magnetic heading * \remarks Intentionally allowing +/- CAngle , and >= / <= CAngle. */ - class CHeading : public CValueObject + class BLACKMISC_EXPORT CHeading : public CValueObject { public: //! Enum type to distinguish between true north and magnetic north diff --git a/src/blackmisc/aviation/informationmessage.h b/src/blackmisc/aviation/informationmessage.h index e14d02035..10414e421 100644 --- a/src/blackmisc/aviation/informationmessage.h +++ b/src/blackmisc/aviation/informationmessage.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_INFORMATIONMESSAGE_H #define BLACKMISC_AVIATION_INFORMATIONMESSAGE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscfreefunctions.h" #include @@ -22,7 +23,7 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating information message (ATIS, METAR, TAF) - class CInformationMessage : public CValueObject + class BLACKMISC_EXPORT CInformationMessage : public CValueObject { public: /*! diff --git a/src/blackmisc/aviation/navsystem.h b/src/blackmisc/aviation/navsystem.h index 5ce63a106..fcef4178e 100644 --- a/src/blackmisc/aviation/navsystem.h +++ b/src/blackmisc/aviation/navsystem.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_NAVSYSTEM_H #define BLACKMISC_AVIATION_NAVSYSTEM_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/modulator.h" namespace BlackMisc @@ -33,7 +34,7 @@ namespace BlackMisc namespace Aviation { //! NAV system (radio navigation) - class CNavSystem : public CValueObject> + class BLACKMISC_EXPORT CNavSystem : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h index 7dee7d653..9b1f22e72 100644 --- a/src/blackmisc/aviation/selcal.h +++ b/src/blackmisc/aviation/selcal.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_SELCAL_H #define BLACKMISC_AVIATION_SELCAL_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/frequency.h" #include "blackmisc/valueobject.h" @@ -24,7 +25,7 @@ namespace BlackMisc * \see http://en.wikipedia.org/wiki/SELCAL * \see http://www.asri.aero/our-services/selcal/ User Guide */ - class CSelcal : public CValueObject + class BLACKMISC_EXPORT CSelcal : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h index 44355a1fe..d75041bad 100644 --- a/src/blackmisc/aviation/track.h +++ b/src/blackmisc/aviation/track.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_TRACK_H #define BLACKMISC_AVIATION_TRACK_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/angle.h" namespace BlackMisc @@ -35,7 +36,7 @@ namespace BlackMisc * \remarks Intentionally allowing +/- BlackMisc::PhysicalQuantities::CAngle , * and >= / <= CAngle. */ - class CTrack : public CValueObject + class BLACKMISC_EXPORT CTrack : public CValueObject { public: /*! diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h index c0cb794be..cfebb8cec 100644 --- a/src/blackmisc/aviation/transponder.h +++ b/src/blackmisc/aviation/transponder.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_AVIATION_TRANSPONDER_H #define BLACKMISC_AVIATION_TRANSPONDER_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/avionicsbase.h" namespace BlackMisc @@ -28,7 +29,7 @@ namespace BlackMisc namespace Aviation { //! Transponder - class CTransponder : public CValueObject + class BLACKMISC_EXPORT CTransponder : public CValueObject { public: //! Transponder codes diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index e2b6287ed..d04f57d14 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -18,7 +18,7 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += USING_PCH } -DEFINES += LOG_IN_FILE +DEFINES += LOG_IN_FILE BUILD_BLACKMISC_LIB RESOURCES += blackmisc.qrc # lupdate (from cmd, e.g. lupdate blackmisc.pro) diff --git a/src/blackmisc/blackmiscexport.h b/src/blackmisc/blackmiscexport.h new file mode 100644 index 000000000..9fc90d490 --- /dev/null +++ b/src/blackmisc/blackmiscexport.h @@ -0,0 +1,27 @@ +/* Copyright (C) 2014 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + +//! \file + +#ifndef BLACKMISC_MACROS_H +#define BLACKMISC_MACROS_H + +#include + +#ifndef WITH_STATIC +# if defined(BUILD_BLACKMISC_LIB) +# define BLACKMISC_EXPORT Q_DECL_EXPORT +# else +# define BLACKMISC_EXPORT Q_DECL_IMPORT +# endif +#else +# define BLACKMISC_EXPORT +#endif + +#endif // BLACKMISC_MACROS_H \ No newline at end of file diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index a75b6847b..f65ef225a 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_FREEFUNCTIONS_H #define BLACKMISC_FREEFUNCTIONS_H +#include "blackmisc/blackmiscexport.h" #include // for Q_INIT_RESOURCE #include #include @@ -39,21 +40,21 @@ namespace BlackMisc namespace PhysicalQuantities { //! Register all metadata for PQs - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } // PQ namespace Aviation { //! Register metadata for aviation - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } // Aviation namespace Math { //! Register metadata for math (matrices, vectors) - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } // Math @@ -61,54 +62,54 @@ namespace BlackMisc { //! Register metadata for geo (coordinates) - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } // Geo namespace Network { //! Register metadata for network (server, user) - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } namespace Settings { //! Register metadata for settings - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } namespace Audio { //! Register metadata for audio / voice - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); //! Start the Windows mixer - bool startWindowsMixer(); + BLACKMISC_EXPORT bool startWindowsMixer(); } namespace Hardware { //! Register metadata for Hardware - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } namespace Event { //! Register metadata for Event - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } namespace Simulation { //! Register metadata for Simulation - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); } //! Register all relevant metadata in BlackMisc - void registerMetadata(); + BLACKMISC_EXPORT void registerMetadata(); //! Init resources - void initResources(); + BLACKMISC_EXPORT void initResources(); //! Checked version from QVariant template void setFromQVariant(T *value, const QVariant &variant) @@ -134,7 +135,7 @@ namespace BlackMisc * \param localUserType * \return */ - QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType); + BLACKMISC_EXPORT QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType); /*! * Convert a QDBusArgument back to a concrete type if required @@ -145,11 +146,11 @@ namespace BlackMisc * \return QVariant generated from the above * \todo To be removed if a better solution is found */ - QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type); + BLACKMISC_EXPORT QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type); //! Display all user metatypes //! \remarks Used in order to debug code, do not remove - void displayAllUserMetatypesTypes(QTextStream &out); + BLACKMISC_EXPORT void displayAllUserMetatypesTypes(QTextStream &out); /*! * \brief Calculate a single hash value based on a list of individual hash values @@ -157,16 +158,16 @@ namespace BlackMisc * \param className add a hash value for class name on top * \return */ - uint calculateHash(const QList &values, const char *className); + BLACKMISC_EXPORT uint calculateHash(const QList &values, const char *className); //! Hash value, but with int list - uint calculateHash(const QList &values, const char *className); + BLACKMISC_EXPORT uint calculateHash(const QList &values, const char *className); //! Real heap size of an object - size_t heapSizeOf(const QMetaType &type); + BLACKMISC_EXPORT size_t heapSizeOf(const QMetaType &type); //! Real heap size of an object - size_t heapSizeOf(const QMetaObject &objectType); + BLACKMISC_EXPORT size_t heapSizeOf(const QMetaObject &objectType); //! A map converted to string template QString qmapToString(const QMap &map) @@ -185,19 +186,19 @@ namespace BlackMisc } //! Bool to on/off - QString boolToOnOff(bool v, bool i18n = false); + BLACKMISC_EXPORT QString boolToOnOff(bool v, bool i18n = false); //! Bool to yes / no - QString boolToYesNo(bool v, bool i18n = false); + BLACKMISC_EXPORT QString boolToYesNo(bool v, bool i18n = false); //! Bool to true / false - QString boolToTrueFalse(bool v, bool i18n = false); + BLACKMISC_EXPORT QString boolToTrueFalse(bool v, bool i18n = false); //! Get local host name - const QString &localHostName(); + BLACKMISC_EXPORT const QString &localHostName(); //! Get local host name env.variable - const QString &localHostNameEnvVariable(); + BLACKMISC_EXPORT const QString &localHostNameEnvVariable(); //! Own implementation of std::make_unique, a C++14 feature not provided by GCC in C++11 mode template @@ -207,10 +208,10 @@ namespace BlackMisc } //! Creates an incremental json object from two existing objects - QJsonObject getIncrementalObject(const QJsonObject &previousObject, const QJsonObject ¤tObject); + BLACKMISC_EXPORT QJsonObject getIncrementalObject(const QJsonObject &previousObject, const QJsonObject ¤tObject); //! Merges an incremental json object into an existing one - QJsonObject applyIncrementalObject(const QJsonObject &previousObject, const QJsonObject &incrementalObject); + BLACKMISC_EXPORT QJsonObject applyIncrementalObject(const QJsonObject &previousObject, const QJsonObject &incrementalObject); diff --git a/src/blackmisc/digestsignal.h b/src/blackmisc/digestsignal.h index da868c0e4..c040b4622 100644 --- a/src/blackmisc/digestsignal.h +++ b/src/blackmisc/digestsignal.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_DIGESTSIGNAL_H #define BLACKMISC_DIGESTSIGNAL_H +#include "blackmiscexport.h" #include #include @@ -19,7 +20,7 @@ namespace BlackMisc { //! Receive 1..n signal, collect them over time, and resend afer n milliseconds - class CDigestSignal : public QObject + class BLACKMISC_EXPORT CDigestSignal : public QObject { Q_OBJECT diff --git a/src/blackmisc/eveventhotkeyfunction.h b/src/blackmisc/eveventhotkeyfunction.h index 31b658b98..68bef99e0 100644 --- a/src/blackmisc/eveventhotkeyfunction.h +++ b/src/blackmisc/eveventhotkeyfunction.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "valueobject.h" #include "evoriginator.h" #include "hotkeyfunction.h" @@ -22,7 +23,7 @@ namespace BlackMisc namespace Event { //! Value object encapsulating a hotkey function for distribution - class CEventHotkeyFunction : public CValueObject + class BLACKMISC_EXPORT CEventHotkeyFunction : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/evoriginator.h b/src/blackmisc/evoriginator.h index d6030e347..434d2271c 100644 --- a/src/blackmisc/evoriginator.h +++ b/src/blackmisc/evoriginator.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "valueobject.h" #include "blackmiscfreefunctions.h" #include @@ -31,7 +32,7 @@ namespace BlackMisc { //! Value object encapsulating information about the originiator - class COriginator : public CValueObject + class BLACKMISC_EXPORT COriginator : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/filedeleter.h b/src/blackmisc/filedeleter.h index 3eb499ece..808bfedac 100644 --- a/src/blackmisc/filedeleter.h +++ b/src/blackmisc/filedeleter.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_CFILEDELETER_H #define BLACKMISC_CFILEDELETER_H +#include "blackmiscexport.h" #include #include @@ -21,7 +22,7 @@ namespace BlackMisc /*! * Utility class, deleting files when it is destroyed */ - class CFileDeleter + class BLACKMISC_EXPORT CFileDeleter { private: diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index 98d92c842..2b1017f29 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_COORDINATEGEODETIC_H #define BLACKMISC_COORDINATEGEODETIC_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/latitude.h" #include "blackmisc/geo/longitude.h" #include "blackmisc/pq/length.h" @@ -26,7 +27,7 @@ namespace BlackMisc //! \sa http://www.esri.com/news/arcuser/0703/geoid1of3.html //! \sa http://http://www.gmat.unsw.edu.au/snap/gps/clynch_pdfs/coordcvt.pdf (page 5) //! \sa http://en.wikipedia.org/wiki/Geodetic_datum#Vertical_datum - class ICoordinateGeodetic + class BLACKMISC_EXPORT ICoordinateGeodetic { public: //! Properties by index @@ -82,14 +83,14 @@ namespace BlackMisc }; //! Great circle distance between points - BlackMisc::PhysicalQuantities::CLength calculateGreatCircleDistance(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2); + BLACKMISC_EXPORT BlackMisc::PhysicalQuantities::CLength calculateGreatCircleDistance(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2); //! Initial bearing - BlackMisc::PhysicalQuantities::CAngle calculateBearing(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2); + BLACKMISC_EXPORT BlackMisc::PhysicalQuantities::CAngle calculateBearing(const ICoordinateGeodetic &coordinate1, const ICoordinateGeodetic &coordinate2); //! Interface (actually more an abstract class) of coordinate and //! relative position to own aircraft - class ICoordinateWithRelativePosition : public ICoordinateGeodetic + class BLACKMISC_EXPORT ICoordinateWithRelativePosition : public ICoordinateGeodetic { public: //! Get the distance to own plane @@ -126,7 +127,7 @@ namespace BlackMisc //! Geodetic coordinate - class CCoordinateGeodetic : public CValueObject, public ICoordinateGeodetic + class BLACKMISC_EXPORT CCoordinateGeodetic : public CValueObject, public ICoordinateGeodetic { public: diff --git a/src/blackmisc/geo/latitude.h b/src/blackmisc/geo/latitude.h index 5b4920292..4226046c3 100644 --- a/src/blackmisc/geo/latitude.h +++ b/src/blackmisc/geo/latitude.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_GEO_LATITUDE_H #define BLACKMISC_GEO_LATITUDE_H +#include "blackmisc/blackmiscexport.h" #include #include "blackmisc/geo/earthangle.h" @@ -28,7 +29,7 @@ namespace BlackMisc { //! Latitude - class CLatitude : public CValueObject> + class BLACKMISC_EXPORT CLatitude : public CValueObject> { protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blackmisc/geo/longitude.h b/src/blackmisc/geo/longitude.h index be46d3814..fbde73e25 100644 --- a/src/blackmisc/geo/longitude.h +++ b/src/blackmisc/geo/longitude.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_GEO_LONGITUDE_H #define BLACKMISC_GEO_LONGITUDE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/earthangle.h" namespace BlackMisc @@ -27,7 +28,7 @@ namespace BlackMisc { //! Longitude - class CLongitude : public CValueObject> + class BLACKMISC_EXPORT CLongitude : public CValueObject> { protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blackmisc/hardware/joystickbutton.h b/src/blackmisc/hardware/joystickbutton.h index 5cc80199c..f3d14a84c 100644 --- a/src/blackmisc/hardware/joystickbutton.h +++ b/src/blackmisc/hardware/joystickbutton.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_HARDWARE_JOYSTICKBUTTON_H #define BLACKMISC_HARDWARE_JOYSTICKBUTTON_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -21,7 +22,7 @@ namespace BlackMisc namespace Hardware { //! Value object representing a joystick button - class CJoystickButton : public CValueObject + class BLACKMISC_EXPORT CJoystickButton : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/hardware/keyboardkey.h b/src/blackmisc/hardware/keyboardkey.h index fc830e580..e069d3067 100644 --- a/src/blackmisc/hardware/keyboardkey.h +++ b/src/blackmisc/hardware/keyboardkey.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_HARDWARE_KEYBOARDKEY_H #define BLACKMISC_HARDWARE_KEYBOARDKEY_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscfreefunctions.h" #include @@ -22,7 +23,7 @@ namespace BlackMisc namespace Hardware { //! Value object representing a keyboard key. - class CKeyboardKey : public CValueObject + class BLACKMISC_EXPORT CKeyboardKey : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/hardware/keyboardkeylist.h b/src/blackmisc/hardware/keyboardkeylist.h index cc7a7eff9..92deaf05e 100644 --- a/src/blackmisc/hardware/keyboardkeylist.h +++ b/src/blackmisc/hardware/keyboardkeylist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_HARDWARE_KEYBOARDKEYLIST_H #define BLACKMISC_HARDWARE_KEYBOARDKEYLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/hardware/keyboardkey.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" @@ -24,7 +25,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of keyboard keys. */ - class CKeyboardKeyList : public CSequence + class BLACKMISC_EXPORT CKeyboardKeyList : public CSequence { public: //! Default constructor diff --git a/src/blackmisc/hotkeyfunction.h b/src/blackmisc/hotkeyfunction.h index e781b4702..12db8b547 100644 --- a/src/blackmisc/hotkeyfunction.h +++ b/src/blackmisc/hotkeyfunction.h @@ -12,13 +12,14 @@ #ifndef BLACKMISC_HOTKEYFUNCTION_H #define BLACKMISC_HOTKEYFUNCTION_H +#include "blackmiscexport.h" #include "propertyindex.h" #include "blackmiscfreefunctions.h" namespace BlackMisc { //! Value object representing a hotkey function. - class CHotkeyFunction : public CValueObject + class BLACKMISC_EXPORT CHotkeyFunction : public CValueObject { public: //! Function type diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index d9a4dd05c..1ca9ef7c2 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_ICON_H #define BLACKMISC_ICON_H +#include "blackmiscexport.h" #include "valueobject.h" #include "icons.h" #include @@ -25,7 +26,7 @@ namespace BlackMisc //! Value object for icons. An icon is stored in the global icon repository and //! identified by its index. It contains no(!) pyhsical data for the icon itself. - class CIcon : public CValueObject + class BLACKMISC_EXPORT CIcon : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h index 95f29b411..1261dd208 100644 --- a/src/blackmisc/iconlist.h +++ b/src/blackmisc/iconlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_ICONLIST_H #define BLACKMISC_ICONLIST_H +#include "blackmiscexport.h" #include "sequence.h" #include "collection.h" #include "icon.h" @@ -23,7 +24,7 @@ namespace BlackMisc /*! * Icon */ - class CIconList : public CSequence + class BLACKMISC_EXPORT CIconList : public CSequence { public: //! Constructor diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 78cf4d258..84677135c 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -12,12 +12,13 @@ #ifndef BLACKMISC_ICONS_H #define BLACKMISC_ICONS_H +#include "blackmiscexport.h" #include namespace BlackMisc { //! Standard icons - class CIcons + class BLACKMISC_EXPORT CIcons { public: diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h index d9f1fa230..08110c027 100644 --- a/src/blackmisc/json.h +++ b/src/blackmisc/json.h @@ -10,6 +10,7 @@ #ifndef BLACKMISC_JSON_H #define BLACKMISC_JSON_H +#include "blackmiscexport.h" #include #include #include @@ -25,24 +26,24 @@ //! \name Streaming operators for QJsonValue (to value) //! \ingroup JSON //! @{ -const QJsonValue &operator >>(const QJsonValue &json, int &value); -const QJsonValue &operator >>(const QJsonValue &json, qlonglong &value); -const QJsonValue &operator >>(const QJsonValue &json, qulonglong &value); -const QJsonValue &operator >>(const QJsonValue &json, uint &value); -const QJsonValue &operator >>(const QJsonValue &json, qint16 &value); -const QJsonValue &operator >>(const QJsonValue &json, QString &value); -const QJsonValue &operator >>(const QJsonValue &json, double &value); -const QJsonValue &operator >>(const QJsonValue &json, bool &value); -const QJsonValue &operator >>(const QJsonValue &json, QDateTime &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, int &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, qlonglong &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, qulonglong &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, uint &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, qint16 &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, QString &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, double &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, bool &value); -const QJsonValueRef &operator >>(const QJsonValueRef &json, QDateTime &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, int &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, qlonglong &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, qulonglong &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, uint &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, qint16 &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, QString &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, double &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, bool &value); +BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, QDateTime &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, int &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, qlonglong &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, qulonglong &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, uint &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, qint16 &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, QString &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, double &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, bool &value); +BLACKMISC_EXPORT const QJsonValueRef &operator >>(const QJsonValueRef &json, QDateTime &value); //! @} //! \brief Specialized JSON serialization for enum @@ -79,29 +80,29 @@ const &operator>>(const QJsonValueRef &json, ENUM &value) //! \name Streaming operators for QJsonArray (from value) //! \ingroup JSON //! @{ -QJsonArray &operator<<(QJsonArray &json, const int value); -QJsonArray &operator<<(QJsonArray &json, const std::pair &value); -QJsonArray &operator<<(QJsonArray &json, const qlonglong value); -QJsonArray &operator<<(QJsonArray &json, const uint value); -QJsonArray &operator<<(QJsonArray &json, const qulonglong value); -QJsonArray &operator<<(QJsonArray &json, const QString &value); -QJsonArray &operator<<(QJsonArray &json, const double value); -QJsonArray &operator<<(QJsonArray &json, const bool value); -QJsonArray &operator<<(QJsonArray &json, const QDateTime &value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const int value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const std::pair &value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const qlonglong value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const uint value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const qulonglong value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const QString &value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const double value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const bool value); +BLACKMISC_EXPORT QJsonArray &operator<<(QJsonArray &json, const QDateTime &value); //! @} //! \name Streaming operators for QJsonObject (from value) //! \ingroup JSON //! @{ -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); -QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); +BLACKMISC_EXPORT QJsonObject &operator<<(QJsonObject &json, const std::pair &value); //! @} namespace BlackMisc diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index 1a2205ddb..68105f4ca 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "sequence.h" namespace BlackMisc @@ -21,7 +22,7 @@ namespace BlackMisc * * A log handler can filter messages based on their categories. */ - class CLogCategory : public CValueObject + class BLACKMISC_EXPORT CLogCategory : public CValueObject { public: //! \name Predefined special categories (public static methods) diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index 8817c420e..b192fde63 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "logcategory.h" #include "sequence.h" #include "collection.h" @@ -40,7 +41,7 @@ namespace BlackMisc /*! * A sequence of log categories. */ - class CLogCategoryList : public CSequence + class BLACKMISC_EXPORT CLogCategoryList : public CSequence { public: //! Empty constructor. diff --git a/src/blackmisc/loghandler.h b/src/blackmisc/loghandler.h index 425a0c80f..9787007eb 100644 --- a/src/blackmisc/loghandler.h +++ b/src/blackmisc/loghandler.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "logpattern.h" #include "statusmessage.h" #include @@ -25,7 +26,7 @@ namespace BlackMisc /*! * Class for subscribing to log messages. */ - class CLogHandler : public QObject + class BLACKMISC_EXPORT CLogHandler : public QObject { Q_OBJECT @@ -94,7 +95,7 @@ namespace BlackMisc * A class for subscribing to log messages which match particular patterns. * \see CLogHandler::handlerForPattern */ - class CLogPatternHandler : public QObject + class BLACKMISC_EXPORT CLogPatternHandler : public QObject { Q_OBJECT @@ -179,7 +180,7 @@ namespace BlackMisc * * Also provides a thread-safe API for interacting with the CLogHandler. */ - class CLogSubscriber : public QObject + class BLACKMISC_EXPORT CLogSubscriber : public QObject { Q_OBJECT diff --git a/src/blackmisc/logmessage.h b/src/blackmisc/logmessage.h index e0e747684..c30b4cb0f 100644 --- a/src/blackmisc/logmessage.h +++ b/src/blackmisc/logmessage.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "statusmessagelist.h" #include "statusmessage.h" #include "logcategorylist.h" @@ -38,7 +39,7 @@ namespace BlackMisc * \li \c "redundant" To avoid handling the same message twice, this flag identifies a message which has already * been directly returned as the return value of the method which generated it. */ - class CLogMessageHelper + class BLACKMISC_EXPORT CLogMessageHelper { public: //! Deleted constructor. @@ -69,7 +70,7 @@ namespace BlackMisc * The categories are arbitrary string tags which can be attached to the message to categorize it. * A message can have more than one category. The categories can be used for filtering by message handlers. */ - class CLogMessage + class BLACKMISC_EXPORT CLogMessage { public: //! Construct a message with the "uncategorized" category. diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h index ccccf5589..45ac5960d 100644 --- a/src/blackmisc/logpattern.h +++ b/src/blackmisc/logpattern.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "statusmessage.h" #include @@ -35,7 +36,7 @@ namespace BlackMisc /*! * Value class for matching log messages based on their categories. */ - class CLogPattern : public CValueObject + class BLACKMISC_EXPORT CLogPattern : public CValueObject { public: //! Default constructed CLogPattern will match any message. diff --git a/src/blackmisc/math/mathutils.h b/src/blackmisc/math/mathutils.h index 425722c5e..29b37dc18 100644 --- a/src/blackmisc/math/mathutils.h +++ b/src/blackmisc/math/mathutils.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_MATH_MATHUTILS_H #define BLACKMISC_MATH_MATHUTILS_H +#include "blackmisc/blackmiscexport.h" #include #include @@ -21,7 +22,7 @@ namespace BlackMisc { //! Math utils - class CMathUtils + class BLACKMISC_EXPORT CMathUtils { public: diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index 453617bbe..cf966877f 100644 --- a/src/blackmisc/namevariantpair.h +++ b/src/blackmisc/namevariantpair.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NAMEVARIANTPAIR_H #define BLACKMISC_NAMEVARIANTPAIR_H +#include "blackmiscexport.h" #include "variant.h" #include "valueobject.h" #include "icon.h" @@ -19,7 +20,7 @@ namespace BlackMisc { //! Value / variant pair - class CNameVariantPair : public CValueObject + class BLACKMISC_EXPORT CNameVariantPair : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index ba21bb10a..099e0ae36 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NAMEVARIANPAIRTLIST_H #define BLACKMISC_NAMEVARIANPAIRTLIST_H +#include "blackmiscexport.h" #include "namevariantpair.h" #include "collection.h" #include "sequence.h" @@ -20,7 +21,7 @@ namespace BlackMisc { //! Value object encapsulating a list of name/variant pairs //! Currently name must be unique - class CNameVariantPairList : public CSequence + class BLACKMISC_EXPORT CNameVariantPairList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/network/aircraftmapping.h b/src/blackmisc/network/aircraftmapping.h index e7936c0d1..106c5096e 100644 --- a/src/blackmisc/network/aircraftmapping.h +++ b/src/blackmisc/network/aircraftmapping.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_AIRCRAFTMAPPING_H #define BLACKMISC_NETWORK_AIRCRAFTMAPPING_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/valueobject.h" @@ -21,7 +22,7 @@ namespace BlackMisc namespace Network { //! Mapping - class CAircraftMapping : public CValueObject + class BLACKMISC_EXPORT CAircraftMapping : public CValueObject { protected: diff --git a/src/blackmisc/network/aircraftmappinglist.h b/src/blackmisc/network/aircraftmappinglist.h index 0328e096b..88a04eb47 100644 --- a/src/blackmisc/network/aircraftmappinglist.h +++ b/src/blackmisc/network/aircraftmappinglist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_AIRCRAFTMAPPINGLIST_H #define BLACKMISC_NETWORK_AIRCRAFTMAPPINGLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/aircraftmapping.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" @@ -24,7 +25,7 @@ namespace BlackMisc namespace Network { //! Value object encapsulating a list of aircraft mappings - class CAircraftMappingList : public CSequence + class BLACKMISC_EXPORT CAircraftMappingList : public CSequence { public: //! Empty constructor. diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h index 426bdd6c1..f38a218d3 100644 --- a/src/blackmisc/network/client.h +++ b/src/blackmisc/network/client.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_CLIENT_H #define BLACKMISC_NETWORK_CLIENT_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/user.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/network/voicecapabilities.h" @@ -25,7 +26,7 @@ namespace BlackMisc /*! * Another client software. */ - class CClient : public CValueObject + class BLACKMISC_EXPORT CClient : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h index 2d80396b7..d0b8b5829 100644 --- a/src/blackmisc/network/clientlist.h +++ b/src/blackmisc/network/clientlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_CLIENTLIST_H #define BLACKMISC_NETWORK_CLIENTLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/client.h" #include "blackmisc/sequence.h" #include "blackmisc/collection.h" @@ -27,7 +28,7 @@ namespace BlackMisc namespace Network { //! Value object encapsulating a list of voice rooms. - class CClientList : + class BLACKMISC_EXPORT CClientList : public CSequence, public BlackMisc::Aviation::ICallsignObjectList { diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index 80810466d..eb00ab88e 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_SERVER_H #define BLACKMISC_NETWORK_SERVER_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/user.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/valueobject.h" @@ -21,7 +22,7 @@ namespace BlackMisc namespace Network { //! Value object encapsulating information of a server - class CServer : public CValueObject + class BLACKMISC_EXPORT CServer : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h index fac291224..9cbaa5111 100644 --- a/src/blackmisc/network/serverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_SERVERLIST_H #define BLACKMISC_NETWORK_SERVERLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/server.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" @@ -23,7 +24,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of servers. */ - class CServerList : public CSequence + class BLACKMISC_EXPORT CServerList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h index bf3fcc350..d5c9ed017 100644 --- a/src/blackmisc/network/textmessage.h +++ b/src/blackmisc/network/textmessage.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_TEXTMESSAGE_H #define BLACKMISC_NETWORK_TEXTMESSAGE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/timestampbased.h" #include "blackmisc/pq/frequency.h" #include "blackmisc/aviation/callsign.h" @@ -26,7 +27,7 @@ namespace BlackMisc /*! * Value object encapsulating information of a text message */ - class CTextMessage : + class BLACKMISC_EXPORT CTextMessage : public CValueObject, public BlackMisc::ITimestampBased { diff --git a/src/blackmisc/network/textmessagelist.h b/src/blackmisc/network/textmessagelist.h index a4e834bdb..c0605dde5 100644 --- a/src/blackmisc/network/textmessagelist.h +++ b/src/blackmisc/network/textmessagelist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_TEXTMESSAGELIST_H #define BLACKMISC_NETWORK_TEXTMESSAGELIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/textmessage.h" #include "blackmisc/timestampobjectlist.h" #include "blackmisc/collection.h" @@ -27,7 +28,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of text messages */ - class CTextMessageList : + class BLACKMISC_EXPORT CTextMessageList : public CSequence, public BlackMisc::ITimestampObjectList { diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h index 59853e2e0..46b8ef08d 100644 --- a/src/blackmisc/network/user.h +++ b/src/blackmisc/network/user.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_USER_H #define BLACKMISC_NETWORK_USER_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/airporticao.h" #include "blackmisc/propertyindex.h" @@ -26,7 +27,7 @@ namespace BlackMisc /*! * Value object encapsulating information of a user. */ - class CUser : public CValueObject + class BLACKMISC_EXPORT CUser : public CValueObject { public: /*! diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h index d7e712012..1cbd0f19d 100644 --- a/src/blackmisc/network/userlist.h +++ b/src/blackmisc/network/userlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_USERLIST_H #define BLACKMISC_NETWORK_USERLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/user.h" #include "blackmisc/sequence.h" #include "blackmisc/collection.h" @@ -24,7 +25,7 @@ namespace BlackMisc namespace Network { //! Value object encapsulating a list of voice rooms. - class CUserList : public CSequence + class BLACKMISC_EXPORT CUserList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h index 75d9c6361..6e3227725 100644 --- a/src/blackmisc/network/voicecapabilities.h +++ b/src/blackmisc/network/voicecapabilities.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORK_VOICECAPABILITIES_H #define BLACKMISC_NETWORK_VOICECAPABILITIES_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -22,7 +23,7 @@ namespace BlackMisc /*! * Value object encapsulating information for voice capabilities. */ - class CVoiceCapabilities : public CValueObject + class BLACKMISC_EXPORT CVoiceCapabilities : public CValueObject { public: //! Voice capabilities diff --git a/src/blackmisc/networkutils.h b/src/blackmisc/networkutils.h index f2be94372..602fc2361 100644 --- a/src/blackmisc/networkutils.h +++ b/src/blackmisc/networkutils.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_NETWORKUTILS_H #define BLACKMISC_NETWORKUTILS_H +#include "blackmiscexport.h" #include "network/server.h" #include @@ -19,7 +20,7 @@ namespace BlackMisc { //! Utilities, e.g. checking whether a network connection can be established - class CNetworkUtils + class BLACKMISC_EXPORT CNetworkUtils { public: diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h index daa99d9e9..de7c93a9c 100644 --- a/src/blackmisc/pixmap.h +++ b/src/blackmisc/pixmap.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PIXMAP_H #define BLACKMISC_PIXMAP_H +#include "blackmiscexport.h" #include "valueobject.h" #include #include @@ -20,7 +21,7 @@ namespace BlackMisc { //! Value object for icons. An icon is stored in the global icon repository and //! identified by its index. It contains no(!) pyhsical data for the icon itself. - class CPixmap : public CValueObject + class BLACKMISC_EXPORT CPixmap : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/pq/acceleration.h b/src/blackmisc/pq/acceleration.h index 1170164f8..a1b18b201 100644 --- a/src/blackmisc/pq/acceleration.h +++ b/src/blackmisc/pq/acceleration.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_ACCELERATION_H #define BLACKMISC_PQ_ACCELERATION_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -27,7 +28,7 @@ namespace BlackMisc { //! Acceleration - class CAcceleration : public CValueObject> + class BLACKMISC_EXPORT CAcceleration : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/angle.h b/src/blackmisc/pq/angle.h index 7e20f108d..f2def0392 100644 --- a/src/blackmisc/pq/angle.h +++ b/src/blackmisc/pq/angle.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_ANGLE_H #define BLACKMISC_PQ_ANGLE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" #include "blackmisc/math/mathutils.h" @@ -27,7 +28,7 @@ namespace BlackMisc namespace PhysicalQuantities { //! Physical unit angle (radians, degrees) - class CAngle : public CValueObject> + class BLACKMISC_EXPORT CAngle : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/constants.h b/src/blackmisc/pq/constants.h index d2d84ff75..bcb9e1682 100644 --- a/src/blackmisc/pq/constants.h +++ b/src/blackmisc/pq/constants.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_CONSTANTS_H #define BLACKMISC_PQ_CONSTANTS_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/pq.h" namespace BlackMisc @@ -22,7 +23,7 @@ namespace BlackMisc /*! * Physical quantities constants */ - class CPhysicalQuantitiesConstants + class BLACKMISC_EXPORT CPhysicalQuantitiesConstants { public: //! Triple point of purified water, 0.01°C diff --git a/src/blackmisc/pq/frequency.h b/src/blackmisc/pq/frequency.h index b7eb79a97..76ee8f4a9 100644 --- a/src/blackmisc/pq/frequency.h +++ b/src/blackmisc/pq/frequency.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_FREQUENCY_H #define BLACKMISC_PQ_FREQUENCY_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -28,7 +29,7 @@ namespace BlackMisc /*! * Physical unit frequency */ - class CFrequency : public CValueObject> + class BLACKMISC_EXPORT CFrequency : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/length.h b/src/blackmisc/pq/length.h index f6ac53035..e8bfecfd1 100644 --- a/src/blackmisc/pq/length.h +++ b/src/blackmisc/pq/length.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_LENGTH_H #define BLACKMISC_PQ_LENGTH_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -27,7 +28,7 @@ namespace BlackMisc { //! Physical unit length (length) - class CLength : public CValueObject> + class BLACKMISC_EXPORT CLength : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/mass.h b/src/blackmisc/pq/mass.h index 1a44e3bce..7af9c021d 100644 --- a/src/blackmisc/pq/mass.h +++ b/src/blackmisc/pq/mass.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_MASS_H #define BLACKMISC_PQ_MASS_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -29,7 +30,7 @@ namespace BlackMisc /*! * Mass */ - class CMass : public CValueObject> + class BLACKMISC_EXPORT CMass : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index 130a18dcb..b05322e27 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_MEASUREMENTUNIT_H #define BLACKMISC_PQ_MEASUREMENTUNIT_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/math/mathutils.h" #include "blackmisc/blackmiscfreefunctions.h" @@ -46,7 +47,7 @@ namespace BlackMisc /*! * Base class for all units, such as meter, hertz. */ - class CMeasurementUnit : public CValueObject + class BLACKMISC_EXPORT CMeasurementUnit : public CValueObject { protected: /*! diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h index 96e981703..ab381d25a 100644 --- a/src/blackmisc/pq/pqstring.h +++ b/src/blackmisc/pq/pqstring.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_PQSTRING_H #define BLACKMISC_PQ_PQSTRING_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscfreefunctions.h" #include "blackmisc/variant.h" @@ -26,7 +27,7 @@ namespace BlackMisc * \details Used to parse strings into physical quantities, validate strings * \sa BlackMisc::PhysicalQuantity */ - class CPqString : public CValueObject + class BLACKMISC_EXPORT CPqString : public CValueObject { protected: //! \copydoc CValueObject::convertToQString diff --git a/src/blackmisc/pq/pressure.h b/src/blackmisc/pq/pressure.h index e509a2833..459521b3d 100644 --- a/src/blackmisc/pq/pressure.h +++ b/src/blackmisc/pq/pressure.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_PRESSURE_H #define BLACKMISC_PQ_PRESSURE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -29,7 +30,7 @@ namespace BlackMisc /*! * Physical unit distance */ - class CPressure : public CValueObject> + class BLACKMISC_EXPORT CPressure : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/speed.h b/src/blackmisc/pq/speed.h index 911ae40f3..3e5487862 100644 --- a/src/blackmisc/pq/speed.h +++ b/src/blackmisc/pq/speed.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_SPEED_H #define BLACKMISC_PQ_SPEED_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -29,7 +30,7 @@ namespace BlackMisc /*! * Speed class, e.g. "m/s", "NM/h", "km/h", "ft/s" */ - class CSpeed : public CValueObject> + class BLACKMISC_EXPORT CSpeed : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/temperature.h b/src/blackmisc/pq/temperature.h index 194bc7a7a..17396ec56 100644 --- a/src/blackmisc/pq/temperature.h +++ b/src/blackmisc/pq/temperature.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_TEMPERATURE_H #define BLACKMISC_PQ_TEMPERATURE_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -29,7 +30,7 @@ namespace BlackMisc /*! * Physical unit temperature */ - class CTemperature : public CValueObject> + class BLACKMISC_EXPORT CTemperature : public CValueObject> { public: //! Default constructor diff --git a/src/blackmisc/pq/time.h b/src/blackmisc/pq/time.h index a798e6924..e09ff654e 100644 --- a/src/blackmisc/pq/time.h +++ b/src/blackmisc/pq/time.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_PQ_TIME_H #define BLACKMISC_PQ_TIME_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" namespace BlackMisc @@ -29,7 +30,7 @@ namespace BlackMisc /*! * Time class, e.g. "ms", "hour", "s", "day" */ - class CTime : public CValueObject> + class BLACKMISC_EXPORT CTime : public CValueObject> { public: //! Parts diff --git a/src/blackmisc/pq/units.h b/src/blackmisc/pq/units.h index ed8568ba0..44388a637 100644 --- a/src/blackmisc/pq/units.h +++ b/src/blackmisc/pq/units.h @@ -15,6 +15,7 @@ #pragma push_macro("min") #undef min +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/measurementunit.h" #include "blackmisc/blackmiscfreefunctions.h" #include @@ -34,7 +35,7 @@ namespace BlackMisc { //! Specialized class for distance units (meter, foot, nautical miles). - class CLengthUnit : public CValueObject + class BLACKMISC_EXPORT CLengthUnit : public CValueObject { private: template @@ -145,7 +146,7 @@ namespace BlackMisc }; //! Specialized class for angles (degrees, radian). - class CAngleUnit : public CValueObject + class BLACKMISC_EXPORT CAngleUnit : public CValueObject { private: template @@ -236,7 +237,7 @@ namespace BlackMisc }; //! Specialized class for frequency (hertz, mega hertz, kilo hertz). - class CFrequencyUnit : public CValueObject + class BLACKMISC_EXPORT CFrequencyUnit : public CValueObject { private: template @@ -318,7 +319,7 @@ namespace BlackMisc }; //! Specialized class for mass units (kg, lbs). - class CMassUnit : public CValueObject + class BLACKMISC_EXPORT CMassUnit : public CValueObject { private: template @@ -409,7 +410,7 @@ namespace BlackMisc }; //! Specialized class for pressure (psi, hPa, bar). - class CPressureUnit : public CValueObject + class BLACKMISC_EXPORT CPressureUnit : public CValueObject { private: template @@ -517,7 +518,7 @@ namespace BlackMisc }; //! Specialized class for temperatur units (kelvin, centidegree). - class CTemperatureUnit : public CValueObject + class BLACKMISC_EXPORT CTemperatureUnit : public CValueObject { private: template @@ -600,7 +601,7 @@ namespace BlackMisc }; //! Specialized class for speed units (m/s, ft/s, NM/h). - class CSpeedUnit : public CValueObject + class BLACKMISC_EXPORT CSpeedUnit : public CValueObject { private: template @@ -702,7 +703,7 @@ namespace BlackMisc }; //! Specialized class for time units (ms, hour, min). - class CTimeUnit : public CValueObject + class BLACKMISC_EXPORT CTimeUnit : public CValueObject { private: template @@ -828,7 +829,7 @@ namespace BlackMisc }; //! Specialized class for acceleration units (m/s2, ft/s2). - class CAccelerationUnit : public CValueObject + class BLACKMISC_EXPORT CAccelerationUnit : public CValueObject { private: template diff --git a/src/blackmisc/project.h b/src/blackmisc/project.h index a8ffdc28c..d5714035f 100644 --- a/src/blackmisc/project.h +++ b/src/blackmisc/project.h @@ -10,6 +10,7 @@ #ifndef BLACKMISC_CPROJECT_H #define BLACKMISC_CPROJECT_H +#include "blackmiscexport.h" #include namespace BlackMisc @@ -18,7 +19,7 @@ namespace BlackMisc /*! * Metadata about the project */ - class CProject + class BLACKMISC_EXPORT CProject { public: //! with BlackCore? diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 11d5e1acd..3b881aebf 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -14,6 +14,7 @@ #ifndef BLACKMISC_PROPERTYINDEX_H #define BLACKMISC_PROPERTYINDEX_H +#include "blackmiscexport.h" #include "blackmiscfreefunctions.h" #include @@ -24,7 +25,7 @@ namespace BlackMisc * Property index. The index can be nested, that's why it is a sequence * (e.g. PropertyIndexPilot, PropertyIndexRealname). */ - class CPropertyIndex : public CValueObject + class BLACKMISC_EXPORT CPropertyIndex : public CValueObject { // In the first trial I have used CSequence as base class // This has created too much circular dependencies of the headers diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h index da54b74e7..eac5f4025 100644 --- a/src/blackmisc/propertyindexlist.h +++ b/src/blackmisc/propertyindexlist.h @@ -14,6 +14,7 @@ #ifndef BLACKMISC_PROPERTYINDEXLIST_H #define BLACKMISC_PROPERTYINDEXLIST_H +#include "blackmiscexport.h" #include "propertyindex.h" #include "collection.h" #include "sequence.h" @@ -24,7 +25,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of property indexes. */ - class CPropertyIndexList : public CSequence + class BLACKMISC_EXPORT CPropertyIndexList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index 81ea39f09..dfce10f94 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -22,6 +22,8 @@ #ifndef BLACKMISC_PROPERTYINDEXVARIANTMAP_H #define BLACKMISC_PROPERTYINDEXVARIANTMAP_H +#include "blackmiscexport.h" + namespace BlackMisc { // forward declaration @@ -36,7 +38,7 @@ namespace BlackMisc * Specialized value object compliant map for variants, * based on indexes */ - class CPropertyIndexVariantMap : public CValueObject + class BLACKMISC_EXPORT CPropertyIndexVariantMap : public CValueObject { public: @@ -96,22 +98,22 @@ namespace BlackMisc void clear() { this->m_values.clear(); } //! Equal operator, required if maps are directly compared, not with CValueObject - friend bool operator ==(const CPropertyIndexVariantMap &a, const CPropertyIndexVariantMap &b); + BLACKMISC_EXPORT friend bool operator ==(const CPropertyIndexVariantMap &a, const CPropertyIndexVariantMap &b); //! Equal operator, required if maps are directly compared, not with CValueObject - friend bool operator !=(const CPropertyIndexVariantMap &a, const CPropertyIndexVariantMap &b); + BLACKMISC_EXPORT friend bool operator !=(const CPropertyIndexVariantMap &a, const CPropertyIndexVariantMap &b); //! Operator == with CVariant - friend bool operator ==(const CPropertyIndexVariantMap &valueMap, const CVariant &variant); + BLACKMISC_EXPORT friend bool operator ==(const CPropertyIndexVariantMap &valueMap, const CVariant &variant); //! Operator != with CVariant - friend bool operator !=(const CPropertyIndexVariantMap &valueMap, const CVariant &variant); + BLACKMISC_EXPORT friend bool operator !=(const CPropertyIndexVariantMap &valueMap, const CVariant &variant); //! Operator == with CVariant - friend bool operator ==(const CVariant &variant, const CPropertyIndexVariantMap &valueMap); + BLACKMISC_EXPORT friend bool operator ==(const CVariant &variant, const CPropertyIndexVariantMap &valueMap); //! Operator != with CVariant - friend bool operator !=(const CVariant &variant, const CPropertyIndexVariantMap &valueMap); + BLACKMISC_EXPORT friend bool operator !=(const CVariant &variant, const CPropertyIndexVariantMap &valueMap); //! Operator == with CValueObject //! \todo Still needed? diff --git a/src/blackmisc/range.h b/src/blackmisc/range.h index bd46ddb1f..3389a6565 100644 --- a/src/blackmisc/range.h +++ b/src/blackmisc/range.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_RANGE_H #define BLACKMISC_RANGE_H +#include "blackmiscexport.h" #include "propertyindexvariantmap.h" #include "iterator.h" #include "predicates.h" diff --git a/src/blackmisc/sampleutils.h b/src/blackmisc/sampleutils.h index 7504b7cc7..0390184b5 100644 --- a/src/blackmisc/sampleutils.h +++ b/src/blackmisc/sampleutils.h @@ -12,13 +12,14 @@ #ifndef BLACKMISC_SAMPLEUTILS_H #define BLACKMISC_SAMPLEUTILS_H +#include "blackmiscexport.h" #include #include namespace BlackMisc { //! Utils for sample programms - class CSampleUtils + class BLACKMISC_EXPORT CSampleUtils { public: diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h index d4722aa03..58011f30f 100644 --- a/src/blackmisc/setaudio.h +++ b/src/blackmisc/setaudio.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SETTINGS_AUDIO_H #define BLACKMISC_SETTINGS_AUDIO_H +#include "blackmiscexport.h" #include "valueobject.h" #include "statusmessagelist.h" #include "settingutilities.h" @@ -23,7 +24,7 @@ namespace BlackMisc namespace Settings { //! Value object encapsulating information of audio related settings. - class CSettingsAudio : public CValueObject + class BLACKMISC_EXPORT CSettingsAudio : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h index 1b66e893c..27b925cef 100644 --- a/src/blackmisc/setkeyboardhotkey.h +++ b/src/blackmisc/setkeyboardhotkey.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SETTINGS_KEYBOARDHOTKEY_H #define BLACKMISC_SETTINGS_KEYBOARDHOTKEY_H +#include "blackmiscexport.h" #include "propertyindex.h" #include "hardware/keyboardkey.h" #include "hotkeyfunction.h" @@ -24,7 +25,7 @@ namespace BlackMisc namespace Settings { //! Value object encapsulating the keyboard hotkey assignment - class CSettingKeyboardHotkey : public CValueObject + class BLACKMISC_EXPORT CSettingKeyboardHotkey : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/setkeyboardhotkeylist.h b/src/blackmisc/setkeyboardhotkeylist.h index 487738ca0..0077b1af0 100644 --- a/src/blackmisc/setkeyboardhotkeylist.h +++ b/src/blackmisc/setkeyboardhotkeylist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SETTINGS_KEYBOARDHOTKEYLIST_H #define BLACKMISC_SETTINGS_KEYBOARDHOTKEYLIST_H +#include "blackmiscexport.h" #include "hardware/keyboardkey.h" #include "setkeyboardhotkey.h" #include "collection.h" @@ -25,7 +26,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of keyboard keys. */ - class CSettingKeyboardHotkeyList : public CSequence + class BLACKMISC_EXPORT CSettingKeyboardHotkeyList : public CSequence { public: //! Default constructor diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index 8ac2dd7e1..1b7cb6dad 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SETTINGS_NETWORK_H #define BLACKMISC_SETTINGS_NETWORK_H +#include "blackmiscexport.h" #include "network/serverlist.h" #include "valueobject.h" #include "statusmessagelist.h" @@ -26,7 +27,7 @@ namespace BlackMisc { //! Value object encapsulating information of network related settings. //! \remarks Not only traffic network settings, but also URLs, DBus address, ... - class CSettingsNetwork : public CValueObject + class BLACKMISC_EXPORT CSettingsNetwork : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/settingutilities.h b/src/blackmisc/settingutilities.h index 3c658a185..50302c8a9 100644 --- a/src/blackmisc/settingutilities.h +++ b/src/blackmisc/settingutilities.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SETTINGUTILITIES_H #define BLACKMISC_SETTINGUTILITIES_H +#include "blackmiscexport.h" #include "blackmisc/statusmessagelist.h" namespace BlackMisc @@ -19,7 +20,7 @@ namespace BlackMisc namespace Settings { //! Helper / utility methods for settings - class CSettingUtilities + class BLACKMISC_EXPORT CSettingUtilities { private: CSettingUtilities() {} diff --git a/src/blackmisc/simplecommandparser.h b/src/blackmisc/simplecommandparser.h index 19697b608..44548f3dd 100644 --- a/src/blackmisc/simplecommandparser.h +++ b/src/blackmisc/simplecommandparser.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMPLECOMMANDPARSER_H #define BLACKMISC_SIMPLECOMMANDPARSER_H +#include "blackmiscexport.h" #include #include @@ -19,7 +20,7 @@ namespace BlackMisc { //! Utility methods for simple line parsing used with the command line //! \remarks case insensitive parsing, commands start with . as ".msg" - class CSimpleCommandParser + class BLACKMISC_EXPORT CSimpleCommandParser { public: //! No Constructor diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index 6b7e0d933..e2342fef8 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_AIRCRAFTMODEL_H #define BLACKMISC_SIMULATION_AIRCRAFTMODEL_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/aircraft.h" #include "blackmisc/aviation/aircrafticao.h" #include "blackmisc/network/user.h" @@ -23,7 +24,7 @@ namespace BlackMisc { //! Aircraft model (other pilot, my models on disk) //! \remarks Simulator independent class, supposed to be common denominator - class CAircraftModel : public CValueObject + class BLACKMISC_EXPORT CAircraftModel : public CValueObject { public: //! Model type diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index 106415455..4e3aef6df 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_AIRCRAFTMODELLIST_H #define BLACKMISC_SIMULATION_AIRCRAFTMODELLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" @@ -23,7 +24,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of aircraft models */ - class CAircraftModelList : public CSequence + class BLACKMISC_EXPORT CAircraftModelList : public CSequence { public: //! Empty constructor. diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h index d20197a21..a875484c0 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGENTRY_H #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGENTRY_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" @@ -27,7 +28,7 @@ namespace BlackMisc * \remarks an entry in the aircraft.cfg is title, atc type, ... This class already bundles * relevant entries, hence the class is named Entries (plural) */ - class CAircraftCfgEntries: public BlackMisc::CValueObject + class BLACKMISC_EXPORT CAircraftCfgEntries: public BlackMisc::CValueObject { public: //! Properties by index diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h index fe8cfdf3b..bcf1ab1d2 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGLIST_H #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/fscommon/aircraftcfgentries.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/sequence.h" @@ -29,7 +30,7 @@ namespace BlackMisc { //! Utility, providing FS aircraft.cfg entries - class CAircraftCfgEntriesList : public BlackMisc::CSequence + class BLACKMISC_EXPORT CAircraftCfgEntriesList : public BlackMisc::CSequence { public: diff --git a/src/blackmisc/simulation/fscommon/aircraftmapper.h b/src/blackmisc/simulation/fscommon/aircraftmapper.h index 2ca79adfa..5ad8a1445 100644 --- a/src/blackmisc/simulation/fscommon/aircraftmapper.h +++ b/src/blackmisc/simulation/fscommon/aircraftmapper.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTMAPPER_H #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTMAPPER_H +#include "blackmisc/blackmiscexport.h" #include "aircraftcfgentrieslist.h" #include "../simulatormodelmappings.h" #include "blackmisc/worker.h" @@ -34,7 +35,7 @@ namespace BlackMisc //! Thereafter all existing models and mappings can be obtained from here. //! \sa CAircraftCfgEntries //! \sa CAircraftCfgEntriesList - class CAircraftMapper : public QObject + class BLACKMISC_EXPORT CAircraftMapper : public QObject { Q_OBJECT diff --git a/src/blackmisc/simulation/fscommon/bcdconversions.h b/src/blackmisc/simulation/fscommon/bcdconversions.h index d8c304244..8b731b2c5 100644 --- a/src/blackmisc/simulation/fscommon/bcdconversions.h +++ b/src/blackmisc/simulation/fscommon/bcdconversions.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMON_BCDCONVERSIONS_H #define BLACKMISC_SIMULATION_FSCOMMON_BCDCONVERSIONS_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/frequency.h" #include "blackmisc/aviation/transponder.h" #include @@ -24,7 +25,7 @@ namespace BlackMisc { //! BCD conversions for FS - class CBcdConversions + class BLACKMISC_EXPORT CBcdConversions { public: //! BCD -> decimal diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.h b/src/blackmisc/simulation/fscommon/fscommonutil.h index e6cb389c2..27e0db57b 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.h +++ b/src/blackmisc/simulation/fscommon/fscommonutil.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMONUTIL_H #define BLACKMISC_SIMULATION_FSCOMMONUTIL_H +#include "blackmisc/blackmiscexport.h" #include namespace BlackMisc @@ -21,7 +22,7 @@ namespace BlackMisc namespace FsCommon { //! FS9/X utils - class CFsCommonUtil + class BLACKMISC_EXPORT CFsCommonUtil { public: CFsCommonUtil(); diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.h b/src/blackmisc/simulation/fscommon/vpilotmodelmappings.h index 0cce746c9..f74e47ae7 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.h +++ b/src/blackmisc/simulation/fscommon/vpilotmodelmappings.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELMAPPINGS_H #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELMAPPINGS_H +#include "blackmisc/blackmiscexport.h" #include "../simulatormodelmappings.h" #include @@ -22,7 +23,7 @@ namespace BlackMisc namespace FsCommon { //! Model mappings - class CVPilotModelMappings : public ISimulatorModelMappings + class BLACKMISC_EXPORT CVPilotModelMappings : public ISimulatorModelMappings { public: //! Constructor diff --git a/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h b/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h index e2f3cb323..72ba033e1 100644 --- a/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h +++ b/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSX_SIMSETUP_H #define BLACKMISC_SIMULATION_FSX_SIMSETUP_H +#include "blackmisc/blackmiscexport.h" #include "../simulatorsetup.h" #include @@ -22,7 +23,7 @@ namespace BlackMisc namespace Fsx { //! Simulator settings for FSX Flight simulators - class CFsxSimulatorSetup + class BLACKMISC_EXPORT CFsxSimulatorSetup { public: diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.h b/src/blackmisc/simulation/fsx/simconnectutilities.h index 36873d48f..186d7690d 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.h +++ b/src/blackmisc/simulation/fsx/simconnectutilities.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H #define BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H +#include "blackmisc/blackmiscexport.h" #include #include @@ -34,7 +35,7 @@ namespace BlackMisc namespace Fsx { //! Utilities for SimConnect - class CSimConnectUtilities : public QObject + class BLACKMISC_EXPORT CSimConnectUtilities : public QObject { Q_OBJECT Q_ENUMS(SIMCONNECT_EXCEPTION) diff --git a/src/blackmisc/simulation/ownaircraftprovider.h b/src/blackmisc/simulation/ownaircraftprovider.h index dd6d1e01d..0288606fd 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.h +++ b/src/blackmisc/simulation/ownaircraftprovider.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H #define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/simulatedaircraft.h" namespace BlackMisc @@ -19,7 +20,7 @@ namespace BlackMisc namespace Simulation { //! Direct in memory access to own aircraft - class IOwnAircraftProviderReadOnly + class BLACKMISC_EXPORT IOwnAircraftProviderReadOnly { public: //! Own aircraft as reference @@ -35,7 +36,7 @@ namespace BlackMisc }; //! Direct in memory access to own aircraft - class IOwnAircraftProvider : public IOwnAircraftProviderReadOnly + class BLACKMISC_EXPORT IOwnAircraftProvider : public IOwnAircraftProviderReadOnly { public: @@ -58,7 +59,7 @@ namespace BlackMisc }; //! For testing - class COwnAircraftProviderDummy : public QObject, public IOwnAircraftProvider + class BLACKMISC_EXPORT COwnAircraftProviderDummy : public QObject, public IOwnAircraftProvider { Q_OBJECT @@ -93,7 +94,7 @@ namespace BlackMisc }; //! Delegating class which can be directly used to access an \sa IOwnAircraftProviderReadOnly instance - class COwnAircraftAwareReadOnly + class BLACKMISC_EXPORT COwnAircraftAwareReadOnly { public: //! \copydoc IOwnAircraftProviderReadOnly::ownAircraft @@ -106,7 +107,7 @@ namespace BlackMisc }; //! Delegating class which can be directly used to access an \sa IOwnAircraftProvider instance - class COwnAircraftAware + class BLACKMISC_EXPORT COwnAircraftAware { public: //! \copydoc IOwnAircraftProviderReadOnly::ownAircraft diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 242c57276..dd84901a3 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H #define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" @@ -24,7 +25,7 @@ namespace BlackMisc //! Direct in memory access to remote aircraft //! \note Can not be derived from QObject (as for the signals), as this would create multiple //! inheritance. Hence Q_DECLARE_INTERFACE is used. - class IRemoteAircraftProviderReadOnly + class BLACKMISC_EXPORT IRemoteAircraftProviderReadOnly { public: //! All rendered aircraft @@ -60,7 +61,7 @@ namespace BlackMisc }; //! Direct in memory access to own aircraft - class IRemoteAircraftProvider : public IRemoteAircraftProviderReadOnly + class BLACKMISC_EXPORT IRemoteAircraftProvider : public IRemoteAircraftProviderReadOnly { public: @@ -90,7 +91,7 @@ namespace BlackMisc }; //! Class which can be directly used to access an \sa IRemoteAircraftProviderReadOnly object - class CRemoteAircraftAwareReadOnly + class BLACKMISC_EXPORT CRemoteAircraftAwareReadOnly { public: //! \copydoc IRemoteAircraftProviderReadOnly::renderedAircraft @@ -112,7 +113,7 @@ namespace BlackMisc }; //! Class which can be directly used to access an \sa IRemoteAircraftProvider object - class CRemoteAircraftAware + class BLACKMISC_EXPORT CRemoteAircraftAware { public: //! \copydoc IRemoteAircraftProviderReadOnly::renderedAircraft diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index d6ba86ea3..9bcc4337c 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.h +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDERDUMMY_H #define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDERDUMMY_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/remoteaircraftprovider.h" namespace BlackMisc @@ -20,7 +21,7 @@ namespace BlackMisc { //! Dummy implementation for testing purpose - class CRemoteAircraftProviderDummy : + class BLACKMISC_EXPORT CRemoteAircraftProviderDummy : public QObject, public IRemoteAircraftProvider { diff --git a/src/blackmisc/simulation/setsimulator.h b/src/blackmisc/simulation/setsimulator.h index 45aae8694..67424c40e 100644 --- a/src/blackmisc/simulation/setsimulator.h +++ b/src/blackmisc/simulation/setsimulator.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SETTINGS_SIMULATOR_H #define BLACKMISC_SETTINGS_SIMULATOR_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/valueobject.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/settingutilities.h" @@ -26,7 +27,7 @@ namespace BlackMisc { //! Value object encapsulating information of simulator related settings. //! \deprecated will be removed with new MS settings - class CSettingsSimulator : public BlackMisc::CValueObject + class BLACKMISC_EXPORT CSettingsSimulator : public BlackMisc::CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index d3f85ac41..4db1b893b 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_SIMULATEDAIRCRAFT_H #define BLACKMISC_SIMULATION_SIMULATEDAIRCRAFT_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/aircraft.h" #include "aircraftmodel.h" #include "blackmisc/network/client.h" @@ -22,7 +23,7 @@ namespace BlackMisc { //! Comprehensive information of an aircraft //! \sa CAircraft - class CSimulatedAircraft : public CValueObject + class BLACKMISC_EXPORT CSimulatedAircraft : public CValueObject { public: //! Properties by index diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 27b7df3d3..36adb20d0 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_SIMULATEDNAIRCRAFTLIST_H #define BLACKMISC_SIMULATION_SIMULATEDNAIRCRAFTLIST_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/aviation/aircraftlist.h" @@ -28,7 +29,7 @@ namespace BlackMisc namespace Simulation { //! Value object encapsulating a list of aircraft. - class CSimulatedAircraftList : + class BLACKMISC_EXPORT CSimulatedAircraftList : public BlackMisc::CSequence, public BlackMisc::Aviation::ICallsignObjectList, public BlackMisc::Geo::IGeoObjectWithRelativePositionList diff --git a/src/blackmisc/simulation/simulatorinfolist.h b/src/blackmisc/simulation/simulatorinfolist.h index 61355dd9d..7e7fdaa10 100644 --- a/src/blackmisc/simulation/simulatorinfolist.h +++ b/src/blackmisc/simulation/simulatorinfolist.h @@ -13,6 +13,7 @@ #define BLACKMISC_SIMULATION_SIMULATORINFOLIST_H #include "simulatorplugininfo.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" #include "blackmisc/collection.h" #include @@ -22,7 +23,7 @@ namespace BlackMisc namespace Simulation { //! Value object encapsulating a list of SimulatorInfo objects. - class CSimulatorPluginInfoList : public BlackMisc::CSequence + class BLACKMISC_EXPORT CSimulatorPluginInfoList : public BlackMisc::CSequence { public: //! Default constructor diff --git a/src/blackmisc/simulation/simulatormodelmappings.h b/src/blackmisc/simulation/simulatormodelmappings.h index fce08aec1..60fc59690 100644 --- a/src/blackmisc/simulation/simulatormodelmappings.h +++ b/src/blackmisc/simulation/simulatormodelmappings.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_MODELMAPPINGS_H #define BLACKMISC_SIMULATION_MODELMAPPINGS_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/network/aircraftmappinglist.h" #include @@ -21,7 +22,7 @@ namespace BlackMisc { //! Model mappings interface, different mapping readers (e.g. from database, from vPilot data files) //! can implement this, but provide the same mapping list. - class ISimulatorModelMappings : public QObject + class BLACKMISC_EXPORT ISimulatorModelMappings : public QObject { Q_OBJECT diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h index feb2ff62a..de9834f1b 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.h +++ b/src/blackmisc/simulation/simulatorplugininfo.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_SIMULATION_SIMULATORPLUGININFO_H #define BLACKMISC_SIMULATION_SIMULATORPLUGININFO_H +#include "blackmisc/blackmiscexport.h" #include "blackmisc/propertyindexvariantmap.h" #include "blackmisc/valueobject.h" @@ -20,7 +21,7 @@ namespace BlackMisc namespace Simulation { //! Describing a simulator plugin - class CSimulatorPluginInfo : public BlackMisc::CValueObject + class BLACKMISC_EXPORT CSimulatorPluginInfo : public BlackMisc::CValueObject { //! The _identifier_ property identifies the plugin itself and must be uniqe. Q_PROPERTY(QString identifier READ getIdentifier) diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h index 02b33e862..d8d9c3de7 100644 --- a/src/blackmisc/simulation/simulatorsetup.h +++ b/src/blackmisc/simulation/simulatorsetup.h @@ -13,6 +13,7 @@ #define BLACKMISC_SIMULATION_SIMULATORSETUP_H #include "blackmisc/namevariantpairlist.h" +#include "blackmisc/blackmiscexport.h" #include #include @@ -22,7 +23,7 @@ namespace BlackMisc { //! Simulator settings for flight simulators. //! Those are set up at runtime and represent information about the simulator (like a small registry) - class CSimulatorSetup : public CValueObject + class BLACKMISC_EXPORT CSimulatorSetup : public CValueObject { public: diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index f4b4b9e56..aa4a7f72c 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_STATUSMESSAGE_H #define BLACKMISC_STATUSMESSAGE_H +#include "blackmiscexport.h" #include "icon.h" #include "propertyindex.h" #include "logcategorylist.h" @@ -23,7 +24,7 @@ namespace BlackMisc /*! * Streamable status message, e.g. from Core -> GUI */ - class CStatusMessage : + class BLACKMISC_EXPORT CStatusMessage : public CValueObject, public ITimestampBased { diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index 59195154d..3f6edf181 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_STATUSMESSAGELIST_H #define BLACKMISC_STATUSMESSAGELIST_H +#include "blackmiscexport.h" #include "timestampobjectlist.h" #include "valueobject.h" #include "sequence.h" @@ -24,7 +25,7 @@ namespace BlackMisc /*! * Status messages, e.g. from Core -> GUI */ - class CStatusMessageList : + class BLACKMISC_EXPORT CStatusMessageList : public CSequence, public ITimestampObjectList { diff --git a/src/blackmisc/testing.h b/src/blackmisc/testing.h index 1c5f25ea9..0cacbbca2 100644 --- a/src/blackmisc/testing.h +++ b/src/blackmisc/testing.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_TESTING_H #define BLACKMISC_TESTING_H +#include "blackmiscexport.h" #include "blackmisc/aviation/atcstationlist.h" //! Generate data for testing purposes. @@ -20,7 +21,7 @@ namespace BlackMisc namespace Aviation { //! Generate data for testing aviation classes - class CTesting + class BLACKMISC_EXPORT CTesting { public: //! Generate number of ATC stations diff --git a/src/blackmisc/threadedreader.h b/src/blackmisc/threadedreader.h index 644ee57f6..7c835ebe9 100644 --- a/src/blackmisc/threadedreader.h +++ b/src/blackmisc/threadedreader.h @@ -12,6 +12,7 @@ //! \file +#include "blackmiscexport.h" #include "worker.h" #include #include @@ -25,7 +26,7 @@ namespace BlackMisc * Support for threaded based reading and parsing tasks such * as data files via http, or file system and parsing (such as FSX models) */ - class CThreadedReader : public CContinuousWorker + class BLACKMISC_EXPORT CThreadedReader : public CContinuousWorker { public: //! Thread safe, set update timestamp diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h index 030a735c0..1908147e7 100644 --- a/src/blackmisc/timestampbased.h +++ b/src/blackmisc/timestampbased.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_TIMESTAMPBASED_H #define BLACKMISC_TIMESTAMPBASED_H +#include "blackmiscexport.h" #include "propertyindex.h" #include @@ -19,7 +20,7 @@ namespace BlackMisc { //! Entity with timestamp - class ITimestampBased + class BLACKMISC_EXPORT ITimestampBased { public: //! Properties by index diff --git a/src/blackmisc/tuple.h b/src/blackmisc/tuple.h index f6c826390..8f75df1e6 100644 --- a/src/blackmisc/tuple.h +++ b/src/blackmisc/tuple.h @@ -12,6 +12,8 @@ #ifndef BLACKMISC_TUPLE_H #define BLACKMISC_TUPLE_H +#include "blackmiscexport.h" + /*! * \defgroup Tuples Tuple conversion of object data members */ @@ -204,7 +206,7 @@ namespace BlackMisc //! @} //! \brief Helper class which parses the stringified macro argument. - struct Parser + struct BLACKMISC_EXPORT Parser { Parser(QString); //!< Constructor. QStringList m_raw; //!< The raw macro argument, split by top-level commas. diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index c2af80bdd..2ce9c637a 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_VALUEOBJECT_H #define BLACKMISC_VALUEOBJECT_H +#include "blackmiscexport.h" #include "dbus.h" #include "tuple.h" #include "json.h" @@ -65,7 +66,7 @@ namespace BlackMisc /*! * Default base class for CValueObject. */ - class CEmpty + class BLACKMISC_EXPORT CEmpty { public: //! Base class is alias of itself diff --git a/src/blackmisc/valueobject_private.h b/src/blackmisc/valueobject_private.h index 4e29c8dc5..b30b65841 100644 --- a/src/blackmisc/valueobject_private.h +++ b/src/blackmisc/valueobject_private.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_VALUEOBJECT_PRIVATE_H #define BLACKMISC_VALUEOBJECT_PRIVATE_H +#include "blackmisc/blackmiscexport.h" #include #include #include @@ -29,7 +30,7 @@ namespace BlackMisc void assign(CVariant &, const CVariant &); //! \private Abstract base class representing the set of operations supported by a particular value type. - struct IValueObjectMetaInfo + struct BLACKMISC_EXPORT IValueObjectMetaInfo { virtual ~IValueObjectMetaInfo() = default; virtual QString toQString(const void *object, bool i18n) const = 0; diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index 0da1251d0..3192729c9 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -14,6 +14,7 @@ #ifndef BLACKMISC_VARIANT_H #define BLACKMISC_VARIANT_H +#include "blackmiscexport.h" #include #include #include @@ -43,7 +44,7 @@ namespace BlackMisc * Wrapper around QVariant which provides transparent access to CValueObject methods * of the contained object if it is registered with BlackMisc::registerMetaValueType. */ - class CVariant : public CValueObject + class BLACKMISC_EXPORT CVariant : public CValueObject { public: //! Default constructor. diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index 31439f000..97320d605 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_VARIANTLIST_H #define BLACKMISC_VARIANTLIST_H +#include "blackmiscexport.h" #include "variant.h" #include "sequence.h" #include "collection.h" @@ -22,7 +23,7 @@ namespace BlackMisc /*! * Value object encapsulating a list of variants. */ - class CVariantList : public CSequence + class BLACKMISC_EXPORT CVariantList : public CSequence { public: //! Default constructor. diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h index 7e6262b63..c9627f72f 100644 --- a/src/blackmisc/worker.h +++ b/src/blackmisc/worker.h @@ -12,6 +12,7 @@ #ifndef BLACKMISC_WORKER_H #define BLACKMISC_WORKER_H +#include "blackmiscexport.h" #include #include #include @@ -24,7 +25,7 @@ namespace BlackMisc { //! \private Class for synchronizing singleShot() task with its owner. - class CSingleShotController : public QObject + class BLACKMISC_EXPORT CSingleShotController : public QObject { Q_OBJECT public: @@ -74,7 +75,7 @@ namespace BlackMisc /*! * Just a subclass of QThread whose destructor waits for the thread to finish. */ - class CRegularThread : public QThread + class BLACKMISC_EXPORT CRegularThread : public QThread { public: //! Constructor @@ -91,7 +92,7 @@ namespace BlackMisc /*! * Base class for CWorker and CContinuousWorker. */ - class CWorkerBase : public QObject + class BLACKMISC_EXPORT CWorkerBase : public QObject { Q_OBJECT @@ -187,7 +188,7 @@ namespace BlackMisc * The task is exposed as a function object, so could be a lambda or a hand-written closure. * CWorker can not be subclassed, instead it can be extended with rich callable task objects. */ - class CWorker final : public CWorkerBase + class BLACKMISC_EXPORT CWorker final : public CWorkerBase { Q_OBJECT @@ -213,7 +214,7 @@ namespace BlackMisc /*! * Base class for a long-lived worker object which lives in its own thread. */ - class CContinuousWorker : public CWorkerBase + class BLACKMISC_EXPORT CContinuousWorker : public CWorkerBase { Q_OBJECT