Include style

src/blackmisc/audio/notificationsounds.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "notificationsounds.h"
+#include "blackmisc/audio/notificationsounds.h"
 #include <QStringList>
 #include <QString>
 

src/blackmisc/audio/registermetadataaudio.cpp

@@ -6,9 +6,9 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadataaudio.h"
-#include "audio.h"
-#include "ptt.h"
+#include "blackmisc/audio/registermetadataaudio.h"
+#include "blackmisc/audio/audio.h"
+#include "blackmisc/audio/ptt.h"
 #include "blackmisc/variant.h"
 #include <QDBusMetaType>
 

src/blackmisc/aviation/aircraftcategorylist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTCATEGORYLIST_H
 #define BLACKMISC_AVIATION_AIRCRAFTCATEGORYLIST_H
 
-#include "aircraftcategory.h"
+#include "blackmisc/aviation/aircraftcategory.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"

src/blackmisc/aviation/aircrafticaocode.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
 #define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
 
-#include "aircraftcategory.h"
+#include "blackmisc/aviation/aircraftcategory.h"
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/blackmiscexport.h"

src/blackmisc/aviation/aircrafticaocodelist.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "aircrafticaocodelist.h"
-#include "aircraftcategorylist.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/aviation/aircraftcategorylist.h"
 #include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"
 

src/blackmisc/aviation/aircrafticaocodelist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H
 #define BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H
 
-#include "aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"

src/blackmisc/aviation/aircraftparts.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "aircraftparts.h"
-#include "aircraftlights.h"
+#include "blackmisc/aviation/aircraftparts.h"
+#include "blackmisc/aviation/aircraftlights.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/stringutils.h"

src/blackmisc/aviation/aircraftsituationchange.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONCHANGE_H
 #define BLACKMISC_AVIATION_AIRCRAFTSITUATIONCHANGE_H
 
-#include "callsign.h"
-#include "altitude.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/altitude.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/metaclass.h"

src/blackmisc/aviation/airlineicaocode.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "airlineicaocode.h"
-#include "callsign.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/icons.h"

src/blackmisc/aviation/airlineicaocodelist.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_AVIATION_AIRLINEICAOCODELIST_H
 #define BLACKMISC_AVIATION_AIRLINEICAOCODELIST_H
 
-#include "airlineicaocode.h"
-#include "callsign.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"

src/blackmisc/aviation/altitude.cpp

@@ -18,7 +18,6 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/iconlist.h"
 #include "blackmisc/icons.h"
-#include "altitude.h"
 
 #include <Qt>
 #include <QtGlobal>

src/blackmisc/aviation/flightplan.cpp

@@ -6,10 +6,10 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "flightplan.h"
-#include "airlineicaocode.h"
-#include "flightplan.h"
-#include "altitude.h"
+#include "blackmisc/aviation/flightplan.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/flightplan.h"
+#include "blackmisc/aviation/altitude.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/iconlist.h"

src/blackmisc/aviation/flightplan.h

@@ -11,12 +11,12 @@
 #ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H
 #define BLACKMISC_AVIATION_FLIGHTPLAN_H
 
-#include "airporticaocode.h"
-#include "aircrafticaocode.h"
-#include "altitude.h"
-#include "airlineicaocode.h"
-#include "callsign.h"
-#include "selcal.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/selcal.h"
 #include "blackmisc/network/voicecapabilities.h"
 #include "blackmisc/network/url.h"
 #include "blackmisc/pq/speed.h"

src/blackmisc/aviation/flightplanlist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "flightplanlist.h"
+#include "blackmisc/aviation/flightplanlist.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/predicates.h"

src/blackmisc/aviation/registermetadataaviation.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadataaviation.h"
-#include "aviation.h"
+#include "blackmisc/aviation/registermetadataaviation.h"
+#include "blackmisc/aviation/aviation.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc

src/blackmisc/aviation/simbriefdata.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "simbriefdata.h"
+#include "blackmisc/aviation/simbriefdata.h"
 #include "blackmisc/logcategories.h"
 #include <QStringBuilder>
 

src/blackmisc/db/artifact.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "artifact.h"
+#include "blackmisc/db/artifact.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
 #include <QRegularExpression>

src/blackmisc/db/artifact.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_DB_ARTIFACT_H
 #define BLACKMISC_DB_ARTIFACT_H
 
-#include "distributionlist.h"
-#include "datastore.h"
+#include "blackmisc/db/distributionlist.h"
+#include "blackmisc/db/datastore.h"
 #include "blackmisc/platform.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/network/remotefile.h"

src/blackmisc/db/artifactlist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "artifactlist.h"
+#include "blackmisc/db/artifactlist.h"
 #include "blackmisc/stringutils.h"
 
 using namespace BlackMisc::Network;

src/blackmisc/db/artifactlist.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_DB_ARTIFACTLIST_H
 #define BLACKMISC_DB_ARTIFACTLIST_H
 
-#include "artifact.h"
-#include "distributionlist.h"
-#include "datastoreobjectlist.h"
+#include "blackmisc/db/artifact.h"
+#include "blackmisc/db/distributionlist.h"
+#include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/network/remotefilelist.h"
 #include "blackmisc/platformset.h"
 #include "blackmisc/blackmiscexport.h"

src/blackmisc/db/dbinfo.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "dbinfo.h"
+#include "blackmisc/db/dbinfo.h"
 #include "blackmisc/comparefunctions.h"
 #include <QStringBuilder>
 

src/blackmisc/db/dbinfolist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "dbinfolist.h"
+#include "blackmisc/db/dbinfolist.h"
 
 using namespace BlackMisc::Network;
 

src/blackmisc/db/dbinfolist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_DB_DBINFOYLIST_H
 #define BLACKMISC_DB_DBINFOYLIST_H
 
-#include "dbinfo.h"
+#include "blackmisc/db/dbinfo.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/network/entityflags.h"
 #include "blackmisc/collection.h"

src/blackmisc/db/distribution.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "distribution.h"
+#include "blackmisc/db/distribution.h"
 #include <QRegularExpression>
 #include <QStringBuilder>
 

src/blackmisc/db/distributionlist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "distributionlist.h"
+#include "blackmisc/db/distributionlist.h"
 #include "blackmisc/stringutils.h"
 
 namespace BlackMisc::Db

src/blackmisc/db/distributionlist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_DB_DISTRIBUTIONLIST_H
 #define BLACKMISC_DB_DISTRIBUTIONLIST_H
 
-#include "distribution.h"
+#include "blackmisc/db/distribution.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/platform.h"
 #include "blackmisc/blackmiscexport.h"

src/blackmisc/db/registermetadatadb.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadatadb.h"
-#include "db.h"
+#include "blackmisc/db/registermetadatadb.h"
+#include "blackmisc/db/db.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc

src/blackmisc/db/updateinfo.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "updateinfo.h"
+#include "blackmisc/db/updateinfo.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
 #include <QStringBuilder>

src/blackmisc/db/updateinfo.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_DB_UPDATEINFO_H
 #define BLACKMISC_DB_UPDATEINFO_H
 
-#include "artifactlist.h"
-#include "distributionlist.h"
+#include "blackmisc/db/artifactlist.h"
+#include "blackmisc/db/distributionlist.h"
 #include "blackmisc/datacache.h"
 #include "blackmisc/valueobject.h"
 #include <QStringList>

src/blackmisc/geo/coordinategeodeticlist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "coordinategeodeticlist.h"
+#include "blackmisc/geo/coordinategeodeticlist.h"
 #include "math/mathutils.h"
 
 #include <QJsonValue>

src/blackmisc/geo/coordinategeodeticlist.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_GEO_COORDINATEGEODETICLIST_H
 #define BLACKMISC_GEO_COORDINATEGEODETICLIST_H
 
-#include "elevationplane.h"
-#include "coordinategeodetic.h"
-#include "geoobjectlist.h"
+#include "blackmisc/geo/elevationplane.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/geoobjectlist.h"
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"

src/blackmisc/geo/elevationplane.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "elevationplane.h"
-#include "coordinategeodetic.h"
+#include "blackmisc/geo/elevationplane.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/propertyindexref.h"
 

src/blackmisc/geo/kmlutils.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "kmlutils.h"
+#include "blackmisc/geo/kmlutils.h"
 #include <QStringBuilder>
 
 using namespace BlackMisc;

src/blackmisc/geo/registermetadatageo.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadatageo.h"
-#include "geo.h"
+#include "blackmisc/geo/registermetadatageo.h"
+#include "blackmisc/geo/geo.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc

src/blackmisc/input/actionhotkeydefs.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "actionhotkeydefs.h"
+#include "blackmisc/input/actionhotkeydefs.h"
 
 namespace BlackMisc::Input
 {

src/blackmisc/input/actionhotkeylist.cpp

@@ -6,8 +6,6 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "actionhotkeylist.h"
-
 #include "blackmisc/input/actionhotkeylist.h"
 #include "blackmisc/input/hotkeycombination.h"
 

src/blackmisc/input/registermetadatainput.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadatainput.h"
-#include "input.h"
+#include "blackmisc/input/registermetadatainput.h"
+#include "blackmisc/input/input.h"
 #include "blackmisc/variant.h"
 
 #include <QDBusMetaType>

src/blackmisc/network/client.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_NETWORK_CLIENT_H
 #define BLACKMISC_NETWORK_CLIENT_H
 
-#include "user.h"
-#include "voicecapabilities.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/network/voicecapabilities.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"

src/blackmisc/network/clientlist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "clientlist.h"
+#include "blackmisc/network/clientlist.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/network/clientprovider.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "clientprovider.h"
+#include "blackmisc/network/clientprovider.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/verify.h"
 

src/blackmisc/network/clientprovider.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_CLIENTPROVIDER_H
 #define BLACKMISC_NETWORK_CLIENTPROVIDER_H
 
-#include "clientlist.h"
+#include "blackmisc/network/clientlist.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/provider.h"
 #include <QReadWriteLock>

src/blackmisc/network/ecosystemlist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "ecosystemlist.h"
+#include "blackmisc/network/ecosystemlist.h"
 
 namespace BlackMisc::Network
 {

src/blackmisc/network/ecosystemlist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_ECOSYSTEMLIST_H
 #define BLACKMISC_NETWORK_ECOSYSTEMLIST_H
 
-#include "ecosystem.h"
+#include "blackmisc/network/ecosystem.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"

src/blackmisc/network/ecosystemprovider.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "ecosystemprovider.h"
+#include "blackmisc/network/ecosystemprovider.h"
 #include <QReadLocker>
 
 namespace BlackMisc::Network

src/blackmisc/network/ecosystemprovider.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_ECOSYSTEMPROVIDER_H
 #define BLACKMISC_NETWORK_ECOSYSTEMPROVIDER_H
 
-#include "ecosystem.h"
+#include "blackmisc/network/ecosystem.h"
 #include "blackmisc/provider.h"
 #include <QReadWriteLock>
 

src/blackmisc/network/external/qjsonwebtoken.cpp

@@ -4,7 +4,7 @@
 // The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "qjsonwebtoken.h"
+#include "blackmisc/network/external/qjsonwebtoken.h"
 
 #include <QDebug>
 

src/blackmisc/network/rawfsdmessagelist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "rawfsdmessagelist.h"
+#include "blackmisc/network/rawfsdmessagelist.h"
 
 namespace BlackMisc::Network
 {

src/blackmisc/network/rawfsdmessagelist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_RAWFSDMESSAGELIST_H
 #define BLACKMISC_NETWORK_RAWFSDMESSAGELIST_H
 
-#include "rawfsdmessage.h"
+#include "blackmisc/network/rawfsdmessage.h"
 #include "blackmisc/timestampobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"

src/blackmisc/network/registermetadatanetwork.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadatanetwork.h"
-#include "network.h"
+#include "blackmisc/network/registermetadatanetwork.h"
+#include "blackmisc/network/network.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc

src/blackmisc/network/remotefile.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "remotefile.h"
+#include "blackmisc/network/remotefile.h"
 #include "blackmisc/stringutils.h"
 #include <QJsonValue>
 #include <QtGlobal>

src/blackmisc/network/remotefile.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_REMOTEFILE_H
 #define BLACKMISC_NETWORK_REMOTEFILE_H
 
-#include "url.h"
+#include "blackmisc/network/url.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/metaclass.h"

src/blackmisc/network/server.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_NETWORK_SERVER_H
 #define BLACKMISC_NETWORK_SERVER_H
 
-#include "user.h"
-#include "fsdsetup.h"
-#include "ecosystem.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/network/fsdsetup.h"
+#include "blackmisc/network/ecosystem.h"
 #include "blackmisc/audio/voicesetup.h"
 #include "blackmisc/obfuscation.h"
 #include "blackmisc/blackmiscexport.h"

src/blackmisc/network/serverlist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_SERVERLIST_H
 #define BLACKMISC_NETWORK_SERVERLIST_H
 
-#include "server.h"
+#include "blackmisc/network/server.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"

src/blackmisc/network/settings/networksettings.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "networksettings.h"
+#include "blackmisc/network/settings/networksettings.h"
 #include "blackmisc/stringutils.h"
 
 #include <QtGlobal>

src/blackmisc/network/urllog.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_URLLOG_H
 #define BLACKMISC_NETWORK_URLLOG_H
 
-#include "url.h"
+#include "blackmisc/network/url.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscexport.h"

src/blackmisc/pq/registermetadatapq.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadatapq.h"
+#include "blackmisc/pq/registermetadatapq.h"
 #include "blackmisc/pq/acceleration.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/frequency.h"

src/blackmisc/simulation/aircraftmodel.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchingutils.h"
-#include "aircraftmodel.h"
+#include "blackmisc/simulation/matchingutils.h"
+#include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/fileutils.h"

src/blackmisc/simulation/aircraftmodelsetprovider.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "aircraftmodelsetprovider.h"
+#include "blackmisc/simulation/aircraftmodelsetprovider.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/autopublishdata.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "autopublishdata.h"
+#include "blackmisc/simulation/autopublishdata.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/json.h"

src/blackmisc/simulation/backgroundvalidation.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "backgroundvalidation.h"
+#include "blackmisc/simulation/backgroundvalidation.h"
 #include "blackmisc/simulation/aircraftmodelutils.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/threadutils.h"

src/blackmisc/simulation/categorymatcher.cpp

@@ -6,10 +6,10 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "categorymatcher.h"
-#include "simulatedaircraft.h"
-#include "aircraftmatchersetup.h"
-#include "matchingutils.h"
+#include "blackmisc/simulation/categorymatcher.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/simulation/aircraftmatchersetup.h"
+#include "blackmisc/simulation/matchingutils.h"
 #include "blackmisc/statusmessagelist.h"
 
 #include <QStringBuilder>

src/blackmisc/simulation/categorymatcher.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_CATEGORYMATCHER_H
 #define BLACKMISC_SIMULATION_CATEGORYMATCHER_H
 
-#include "aircraftmodellist.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/aviation/aircraftcategorylist.h"
 #include "blackmisc/blackmiscexport.h"
 

src/blackmisc/simulation/distributorlist.cpp

@@ -6,9 +6,9 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "distributorlist.h"
-#include "simulatorinfo.h"
-#include "aircraftmodel.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "blackmisc/simulation/aircraftmodel.h"
 
 #include <tuple>
 

src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "aircraftmodelloaderflightgear.h"
+#include "blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include <QDirIterator>
 namespace BlackMisc::Simulation::Flightgear

src/blackmisc/simulation/flightgear/flightgearutil.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "flightgearutil.h"
+#include "blackmisc/simulation/flightgear/flightgearutil.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/directoryutils.h"
 #include "blackconfig/buildconfig.h"

src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp

@@ -9,7 +9,7 @@
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
 #include "blackmisc/statusmessagelist.h"
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"

src/blackmisc/simulation/interpolant.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLANT_H
 #define BLACKMISC_SIMULATION_INTERPOLANT_H
 
-#include "interpolatorpbh.h"
+#include "blackmisc/simulation/interpolatorpbh.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/interpolationlogger.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolationlogger.h"
+#include "blackmisc/simulation/interpolationlogger.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/geo/kmlutils.h"

src/blackmisc/simulation/interpolationlogger.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H
 #define BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H
 
-#include "interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolationrenderingsetup.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/aircraftpartslist.h"

src/blackmisc/simulation/interpolationrenderingsetup.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolationrenderingsetup.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"

src/blackmisc/simulation/interpolationsetuplist.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolationsetuplist.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/interpolationsetuplist.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H
 #define BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H
 
-#include "interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolationrenderingsetup.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"

src/blackmisc/simulation/interpolationsetupprovider.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolationsetupprovider.h"
+#include "blackmisc/simulation/interpolationsetupprovider.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/simulation/interpolationsetupprovider.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H
 #define BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H
 
-#include "interpolationsetuplist.h"
-#include "interpolationrenderingsetup.h"
-#include "interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolationsetuplist.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/provider.h"
 #include <QMap>

src/blackmisc/simulation/interpolator.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolator.h"
+#include "blackmisc/simulation/interpolator.h"
 #include "blackconfig/buildconfig.h"
 #include "blackmisc/simulation/interpolationlogger.h"
 #include "blackmisc/simulation/interpolatorlinear.h"

src/blackmisc/simulation/interpolator.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLATOR_H
 #define BLACKMISC_SIMULATION_INTERPOLATOR_H
 
-#include "interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolationrenderingsetup.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/simulation/interpolationsetupprovider.h"
 #include "blackmisc/simulation/simulationenvironmentprovider.h"

src/blackmisc/simulation/interpolatorlinear.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolatorlinear.h"
-#include "interpolatorfunctions.h"
+#include "blackmisc/simulation/interpolatorlinear.h"
+#include "blackmisc/simulation/interpolatorfunctions.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/geo/coordinategeodetic.h"

src/blackmisc/simulation/interpolatorlinear.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H
 #define BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H
 
-#include "interpolator.h"
-#include "interpolationlogger.h"
-#include "interpolant.h"
+#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolant.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QString>

src/blackmisc/simulation/interpolatorpbh.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolatorpbh.h"
-#include "interpolatorfunctions.h"
+#include "blackmisc/simulation/interpolatorpbh.h"
+#include "blackmisc/simulation/interpolatorfunctions.h"
 #include "blackmisc/verify.h"
 #include "blackconfig/buildconfig.h"
 

src/blackmisc/simulation/interpolatorspline.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "interpolatorspline.h"
-#include "interpolatorfunctions.h"
+#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolatorfunctions.h"
 #include "blackmisc/network/fsdsetup.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/verify.h"

src/blackmisc/simulation/interpolatorspline.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H
 #define BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H
 
-#include "interpolator.h"
-#include "interpolationlogger.h"
-#include "interpolant.h"
+#include "blackmisc/simulation/interpolator.h"
+#include "blackmisc/simulation/interpolationlogger.h"
+#include "blackmisc/simulation/interpolant.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QString>

src/blackmisc/simulation/matchinglog.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchinglog.h"
+#include "blackmisc/simulation/matchinglog.h"
 #include <QStringList>
 
 namespace BlackMisc::Simulation

src/blackmisc/simulation/matchingscript.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchingscript.h"
+#include "blackmisc/simulation/matchingscript.h"
 #include "stringutils.h"
 
 using namespace BlackMisc::Aviation;

src/blackmisc/simulation/matchingscriptmisc.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchingscriptmisc.h"
+#include "blackmisc/simulation/matchingscriptmisc.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/matchingstatistics.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchingstatistics.h"
+#include "blackmisc/simulation/matchingstatistics.h"
 
 namespace BlackMisc::Simulation
 {

src/blackmisc/simulation/matchingstatistics.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_MATCHINGSTATISTICS_H
 #define BLACKMISC_SIMULATION_MATCHINGSTATISTICS_H
 
-#include "matchingstatisticsentry.h"
+#include "blackmisc/simulation/matchingstatisticsentry.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/timestampobjectlist.h"
 #include "blackmisc/sequence.h"

src/blackmisc/simulation/matchingstatisticsentry.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchingstatisticsentry.h"
+#include "blackmisc/simulation/matchingstatisticsentry.h"
 #include "blackmisc/comparefunctions.h"
 
 namespace BlackMisc::Simulation

src/blackmisc/simulation/matchingutils.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "matchingutils.h"
+#include "blackmisc/simulation/matchingutils.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/simulation/modelconverterx.cpp

@@ -6,10 +6,10 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
+#include "blackmisc/simulation/modelconverterx.h"
 #include "blackconfig/buildconfig.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/logmessage.h"
-#include "modelconverterx.h"
 #include <QFile>
 #include <QDir>
 

src/blackmisc/simulation/registermetadatasimulation.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "registermetadatasimulation.h"
-#include "simulation.h"
+#include "blackmisc/simulation/registermetadatasimulation.h"
+#include "blackmisc/simulation/simulation.h"
 #include "blackmisc/variant.h"
 
 using namespace BlackMisc::Simulation;

src/blackmisc/simulation/settings/modelsettings.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "modelsettings.h"
+#include "blackmisc/simulation/settings/modelsettings.h"
 #include "blackmisc/stringutils.h"
 
 namespace BlackMisc::Simulation::Settings

src/blackmisc/simulation/settings/simulatorsettings.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "simulatorsettings.h"
+#include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/fscommon/fsdirectories.h"
 #include "blackmisc/simulation/xplane/xplaneutil.h"

src/blackmisc/simulation/settings/swiftpluginsettings.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "swiftpluginsettings.h"
+#include "blackmisc/simulation/settings/swiftpluginsettings.h"
 #include "blackmisc/stringutils.h"
 
 namespace BlackMisc::Simulation::Settings

src/blackmisc/simulation/settings/xswiftbussettings.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "xswiftbussettings.h"
-#include "xswiftbussettingsqtfree.inc"
+#include "blackmisc/simulation/settings/xswiftbussettings.h"
+#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.inc"
 
 namespace BlackMisc::Simulation::Settings
 {

src/blackmisc/simulation/settings/xswiftbussettings.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_SETTINGS_XSWIFTBUSSETTINGS_H
 #define BLACKMISC_SIMULATION_SETTINGS_XSWIFTBUSSETTINGS_H
 
-#include "xswiftbussettingsqtfree.h"
+#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/dbusserver.h"

src/blackmisc/simulation/simulationenvironmentprovider.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "simulationenvironmentprovider.h"
+#include "blackmisc/simulation/simulationenvironmentprovider.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
 
 #include "blackmisc/logmessage.h"

src/blackmisc/simulation/simulationenvironmentprovider.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_SIMULATION_SIMULATIONENVIRONMENTPROVIDER_H
 #define BLACKMISC_SIMULATION_SIMULATIONENVIRONMENTPROVIDER_H
 
-#include "simulatorplugininfo.h"
-#include "aircraftmodel.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
+#include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/percallsign.h"

src/blackmisc/simulation/xplane/xplaneutil.cpp

@@ -10,7 +10,7 @@
 #include "blackmisc/fileutils.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
-#include "qsystemdetection.h"
+#include <qsystemdetection.h>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>

src/blackmisc/test/testdata.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "testdata.h"
+#include "blackmisc/test/testdata.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/flightplan.h"

src/blackmisc/test/testing.cpp

@@ -6,6 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
+#include "blackmisc/test/testing.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/iterator.h"
@@ -17,7 +18,6 @@
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/variant.h"
-#include "testing.h"
 
 #include <QDateTime>
 #include <QList>