diff --git a/src/blackmisc/algorithm.h b/src/blackmisc/algorithm.h index ef85ae7cd..df0621dc8 100644 --- a/src/blackmisc/algorithm.h +++ b/src/blackmisc/algorithm.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_ALGORITHM_H #define BLACKMISC_ALGORITHM_H -#include "integersequence.h" +#include "blackmisc/integersequence.h" #include #include diff --git a/src/blackmisc/applicationinfolist.cpp b/src/blackmisc/applicationinfolist.cpp index 027067f77..1d548ee9a 100644 --- a/src/blackmisc/applicationinfolist.cpp +++ b/src/blackmisc/applicationinfolist.cpp @@ -7,7 +7,7 @@ */ #include "blackmisc/applicationinfolist.h" -#include "directoryutils.h" +#include "blackmisc/directoryutils.h" #include "blackconfig/buildconfig.h" using namespace BlackConfig; diff --git a/src/blackmisc/appstarttime.cpp b/src/blackmisc/appstarttime.cpp index 71eb9c361..2748d4cc7 100644 --- a/src/blackmisc/appstarttime.cpp +++ b/src/blackmisc/appstarttime.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "appstarttime.h" +#include "blackmisc/appstarttime.h" namespace BlackMisc { diff --git a/src/blackmisc/audio/audiosettings.cpp b/src/blackmisc/audio/audiosettings.cpp index d2563579a..ff65340d9 100644 --- a/src/blackmisc/audio/audiosettings.cpp +++ b/src/blackmisc/audio/audiosettings.cpp @@ -7,15 +7,13 @@ */ #include "blackmisc/audio/audiosettings.h" - +#include "blackmisc/directoryutils.h" +#include "blackmisc/fileutils.h" #include #include #include #include -#include "blackmisc/directoryutils.h" -#include "blackmisc/fileutils.h" - using namespace BlackMisc::Audio; namespace BlackMisc diff --git a/src/blackmisc/cachesettingsutils.cpp b/src/blackmisc/cachesettingsutils.cpp index 5151ff8df..0bb066ef1 100644 --- a/src/blackmisc/cachesettingsutils.cpp +++ b/src/blackmisc/cachesettingsutils.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "cachesettingsutils.h" -#include "settingscache.h" -#include "datacache.h" +#include "blackmisc/cachesettingsutils.h" +#include "blackmisc/settingscache.h" +#include "blackmisc/datacache.h" #include namespace BlackMisc diff --git a/src/blackmisc/cachesettingsutils.h b/src/blackmisc/cachesettingsutils.h index 45a91773b..62f6d149e 100644 --- a/src/blackmisc/cachesettingsutils.h +++ b/src/blackmisc/cachesettingsutils.h @@ -12,7 +12,7 @@ #define BLACKMISC_CACHESETTINGSUTILS_H #include "blackmisc/applicationinfo.h" -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" #include namespace BlackMisc diff --git a/src/blackmisc/collection.h b/src/blackmisc/collection.h index 7d1dda81f..ce4a1eab2 100644 --- a/src/blackmisc/collection.h +++ b/src/blackmisc/collection.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_COLLECTION_H #define BLACKMISC_COLLECTION_H -#include "containerbase.h" -#include "datastream.h" -#include "icon.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/datastream.h" +#include "blackmisc/icon.h" #include #include #include diff --git a/src/blackmisc/comparefunctions.cpp b/src/blackmisc/comparefunctions.cpp index 18f49f25d..619791dca 100644 --- a/src/blackmisc/comparefunctions.cpp +++ b/src/blackmisc/comparefunctions.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "comparefunctions.h" +#include "blackmisc/comparefunctions.h" namespace BlackMisc { diff --git a/src/blackmisc/compressutils.cpp b/src/blackmisc/compressutils.cpp index 8fd500162..ea08ca5db 100644 --- a/src/blackmisc/compressutils.cpp +++ b/src/blackmisc/compressutils.cpp @@ -6,11 +6,11 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "compressutils.h" +#include "blackmisc/compressutils.h" +#include "blackmisc/fileutils.h" +#include "blackmisc/directoryutils.h" +#include "blackmisc/stringutils.h" #include "blackconfig/buildconfig.h" -#include "fileutils.h" -#include "directoryutils.h" -#include "stringutils.h" #include #include diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h index e79f4694c..e81e346e7 100644 --- a/src/blackmisc/containerbase.h +++ b/src/blackmisc/containerbase.h @@ -11,11 +11,11 @@ #ifndef BLACKMISC_CONTAINERBASE_H #define BLACKMISC_CONTAINERBASE_H -#include "range.h" -#include "predicates.h" -#include "json.h" -#include "variant.h" -#include "dbus.h" +#include "blackmisc/range.h" +#include "blackmisc/predicates.h" +#include "blackmisc/json.h" +#include "blackmisc/variant.h" +#include "blackmisc/dbus.h" #include #include diff --git a/src/blackmisc/crashhandler.cpp b/src/blackmisc/crashhandler.cpp index 9076a832d..4db2c6338 100644 --- a/src/blackmisc/crashhandler.cpp +++ b/src/blackmisc/crashhandler.cpp @@ -6,13 +6,12 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "crashhandler.h" - -#include "blackconfig/buildconfig.h" +#include "blackmisc/crashhandler.h" #include "blackmisc/appstarttime.h" #include "blackmisc/directoryutils.h" #include "blackmisc/logmessage.h" #include "blackmisc/filelogger.h" +#include "blackconfig/buildconfig.h" #include #include diff --git a/src/blackmisc/crashinfo.cpp b/src/blackmisc/crashinfo.cpp index 08ed9af6a..b16d0f4b7 100644 --- a/src/blackmisc/crashinfo.cpp +++ b/src/blackmisc/crashinfo.cpp @@ -7,7 +7,7 @@ */ #include "blackmisc/crashinfo.h" -#include "fileutils.h" +#include "blackmisc/fileutils.h" #include #include diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index 40979dd1a..8b028a136 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -8,8 +8,8 @@ //! \cond PRIVATE -#include "blackmisc/atomicfile.h" #include "blackmisc/datacache.h" +#include "blackmisc/atomicfile.h" #include "blackmisc/directoryutils.h" #include "blackmisc/identifier.h" #include "blackmisc/logmessage.h" diff --git a/src/blackmisc/dbus.cpp b/src/blackmisc/dbus.cpp index 400ef29d5..cf5731d34 100644 --- a/src/blackmisc/dbus.cpp +++ b/src/blackmisc/dbus.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "dbus.h" +#include "blackmisc/dbus.h" #ifdef Q_OS_WIN #include diff --git a/src/blackmisc/dbusutils.cpp b/src/blackmisc/dbusutils.cpp index 0d6c21e56..c18cc296a 100644 --- a/src/blackmisc/dbusutils.cpp +++ b/src/blackmisc/dbusutils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "dbusutils.h" +#include "blackmisc/dbusutils.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/airport.h" #include diff --git a/src/blackmisc/digestsignal.cpp b/src/blackmisc/digestsignal.cpp index 92ba53f1f..ec3fa8341 100644 --- a/src/blackmisc/digestsignal.cpp +++ b/src/blackmisc/digestsignal.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "digestsignal.h" -#include "threadutils.h" +#include "blackmisc/digestsignal.h" +#include "blackmisc/threadutils.h" #include namespace BlackMisc diff --git a/src/blackmisc/directories.cpp b/src/blackmisc/directories.cpp index ca61290bc..c67fe8893 100644 --- a/src/blackmisc/directories.cpp +++ b/src/blackmisc/directories.cpp @@ -7,7 +7,7 @@ */ #include "blackmisc/directories.h" -#include "directoryutils.h" +#include "blackmisc/directoryutils.h" #include #include diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp index a2be93a26..00f25a093 100644 --- a/src/blackmisc/directoryutils.cpp +++ b/src/blackmisc/directoryutils.cpp @@ -8,10 +8,10 @@ //! \cond PRIVATE -#include "directoryutils.h" -#include "fileutils.h" -#include "stringutils.h" -#include "range.h" +#include "blackmisc/directoryutils.h" +#include "blackmisc/fileutils.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/range.h" #include "blackconfig/buildconfig.h" #include #include diff --git a/src/blackmisc/directoryutils.h b/src/blackmisc/directoryutils.h index 3125f8056..3bdff954e 100644 --- a/src/blackmisc/directoryutils.h +++ b/src/blackmisc/directoryutils.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_DIRECTORYUTILS_H #define BLACKMISC_DIRECTORYUTILS_H -#include "applicationinfo.h" -#include "blackmiscexport.h" +#include "blackmisc/applicationinfo.h" +#include "blackmisc/blackmiscexport.h" #include #include #include diff --git a/src/blackmisc/filelogger.cpp b/src/blackmisc/filelogger.cpp index f97417ceb..760e44277 100644 --- a/src/blackmisc/filelogger.cpp +++ b/src/blackmisc/filelogger.cpp @@ -6,11 +6,11 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackconfig/buildconfig.h" -#include "blackmisc/appstarttime.h" #include "blackmisc/filelogger.h" +#include "blackmisc/appstarttime.h" #include "blackmisc/loghandler.h" #include "blackmisc/directoryutils.h" +#include "blackconfig/buildconfig.h" #include #include diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp index e9a7ad18c..5779b4c85 100644 --- a/src/blackmisc/fileutils.cpp +++ b/src/blackmisc/fileutils.cpp @@ -6,10 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/fileutils.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/math/mathutils.h" #include "blackmisc/worker.h" -#include "blackmisc/fileutils.h" #include "blackmisc/directoryutils.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackmisc/genericdbusinterface.h b/src/blackmisc/genericdbusinterface.h index a901da351..e286c9989 100644 --- a/src/blackmisc/genericdbusinterface.h +++ b/src/blackmisc/genericdbusinterface.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_GENERICDBUSINTERFACE_H #define BLACKMISC_GENERICDBUSINTERFACE_H -#include "logmessage.h" +#include "blackmisc/logmessage.h" #include "blackmisc/promise.h" #include #include diff --git a/src/blackmisc/htmlutils.cpp b/src/blackmisc/htmlutils.cpp index 194644085..b86f7223c 100644 --- a/src/blackmisc/htmlutils.cpp +++ b/src/blackmisc/htmlutils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "htmlutils.h" +#include "blackmisc/htmlutils.h" #include namespace BlackMisc diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 1336dd69a..10896a1e1 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/iconlist.h" #include "blackmisc/containerbase.h" #include "blackmisc/dbus.h" -#include "blackmisc/iconlist.h" #include "blackmisc/range.h" #include "blackmisc/variant.h" #include diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 680b7e253..77d756657 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -8,9 +8,9 @@ //! \cond PRIVATE +#include "blackmisc/icons.h" #include "blackmisc/directoryutils.h" #include "blackmisc/fileutils.h" -#include "blackmisc/icons.h" #include "blackmisc/threadutils.h" #include diff --git a/src/blackmisc/identifierlist.cpp b/src/blackmisc/identifierlist.cpp index c0dfecf3a..abe2fddea 100644 --- a/src/blackmisc/identifierlist.cpp +++ b/src/blackmisc/identifierlist.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/compare.h" #include "blackmisc/identifierlist.h" +#include "blackmisc/compare.h" #include #include diff --git a/src/blackmisc/imageutils.cpp b/src/blackmisc/imageutils.cpp index 96a1b3e6e..a356a7b3f 100644 --- a/src/blackmisc/imageutils.cpp +++ b/src/blackmisc/imageutils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "imageutils.h" +#include "blackmisc/imageutils.h" #include "blackmisc/stringutils.h" #include diff --git a/src/blackmisc/inheritancetraits.h b/src/blackmisc/inheritancetraits.h index 82e2f4e6f..03b1e3cb4 100644 --- a/src/blackmisc/inheritancetraits.h +++ b/src/blackmisc/inheritancetraits.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_INHERITANCE_TRAITS_H #define BLACKMISC_INHERITANCE_TRAITS_H -#include "typetraits.h" +#include "blackmisc/typetraits.h" #include #include diff --git a/src/blackmisc/iterator.h b/src/blackmisc/iterator.h index fa3b6e86b..e48c3b4a6 100644 --- a/src/blackmisc/iterator.h +++ b/src/blackmisc/iterator.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_ITERATOR_H #define BLACKMISC_ITERATOR_H -#include "optional.h" -#include "typetraits.h" +#include "blackmisc/optional.h" +#include "blackmisc/typetraits.h" #include #include #include diff --git a/src/blackmisc/json.cpp b/src/blackmisc/json.cpp index e84a18111..247059c8f 100644 --- a/src/blackmisc/json.cpp +++ b/src/blackmisc/json.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "json.h" +#include "blackmisc/json.h" #include "blackmisc/imageutils.h" #include "blackmisc/stringutils.h" diff --git a/src/blackmisc/librarypath.cpp b/src/blackmisc/librarypath.cpp index 5869b36af..2b4fd3846 100644 --- a/src/blackmisc/librarypath.cpp +++ b/src/blackmisc/librarypath.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "librarypath.h" +#include "blackmisc/librarypath.h" #include #include #include diff --git a/src/blackmisc/librarypath.h b/src/blackmisc/librarypath.h index eb752ecb4..497fa5147 100644 --- a/src/blackmisc/librarypath.h +++ b/src/blackmisc/librarypath.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_LIBRARYPATH_H #define BLACKMISC_LIBRARYPATH_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" namespace BlackMisc { diff --git a/src/blackmisc/logcategorylist.cpp b/src/blackmisc/logcategorylist.cpp index 9a1ac2408..fe7b07534 100644 --- a/src/blackmisc/logcategorylist.cpp +++ b/src/blackmisc/logcategorylist.cpp @@ -6,10 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/logcategorylist.h" #include "blackmisc/containerbase.h" #include "blackmisc/dbus.h" #include "blackmisc/iterator.h" -#include "blackmisc/logcategorylist.h" #include "blackmisc/range.h" #include "blackmisc/variant.h" diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp index e97bfefc0..3c029538b 100644 --- a/src/blackmisc/loghandler.cpp +++ b/src/blackmisc/loghandler.cpp @@ -8,10 +8,10 @@ //! \cond PRIVATE +#include "blackmisc/loghandler.h" #include "blackmisc/algorithm.h" #include "blackmisc/compare.h" #include "blackmisc/crashhandler.h" -#include "blackmisc/loghandler.h" #include "blackmisc/worker.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackmisc/logmessage.cpp b/src/blackmisc/logmessage.cpp index fa0e7c709..6c19d83d5 100644 --- a/src/blackmisc/logmessage.cpp +++ b/src/blackmisc/logmessage.cpp @@ -8,7 +8,7 @@ //! \cond PRIVATE -#include "logmessage.h" +#include "blackmisc/logmessage.h" namespace BlackMisc { diff --git a/src/blackmisc/logmessage.h b/src/blackmisc/logmessage.h index 2f0e61480..4117ccfb1 100644 --- a/src/blackmisc/logmessage.h +++ b/src/blackmisc/logmessage.h @@ -11,11 +11,11 @@ //! \file -#include "blackmiscexport.h" -#include "statusmessagelist.h" -#include "statusmessage.h" -#include "logcategorylist.h" -#include "integersequence.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/integersequence.h" #include #include #include diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp index ea6bc16c1..e1f0f1ca5 100644 --- a/src/blackmisc/logpattern.cpp +++ b/src/blackmisc/logpattern.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/logpattern.h" #include "blackmisc/logcategory.h" #include "blackmisc/logcategorylist.h" -#include "blackmisc/logpattern.h" #include "blackmisc/sequence.h" #include diff --git a/src/blackmisc/metadatautils.cpp b/src/blackmisc/metadatautils.cpp index bd38e4965..b93188788 100644 --- a/src/blackmisc/metadatautils.cpp +++ b/src/blackmisc/metadatautils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "metadatautils.h" +#include "blackmisc/metadatautils.h" #include #include diff --git a/src/blackmisc/network/ecosystem.cpp b/src/blackmisc/network/ecosystem.cpp index c100c2dbf..9aa4c6b38 100644 --- a/src/blackmisc/network/ecosystem.cpp +++ b/src/blackmisc/network/ecosystem.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "ecosystem.h" +#include "blackmisc/network/ecosystem.h" #include "blackmisc/icon.h" #include "blackmisc/verify.h" #include "blackmisc/comparefunctions.h" diff --git a/src/blackmisc/nullable.cpp b/src/blackmisc/nullable.cpp index 125ac5415..a90f257f8 100644 --- a/src/blackmisc/nullable.cpp +++ b/src/blackmisc/nullable.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/comparefunctions.h" #include "blackmisc/nullable.h" +#include "blackmisc/comparefunctions.h" #include "blackmisc/verify.h" namespace BlackMisc diff --git a/src/blackmisc/obfuscation.cpp b/src/blackmisc/obfuscation.cpp index aca77b8b5..9fb8c86dd 100644 --- a/src/blackmisc/obfuscation.cpp +++ b/src/blackmisc/obfuscation.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "obfuscation.h" +#include "blackmisc/obfuscation.h" #include "blackmisc/thirdparty/simplecrypt.h" #include diff --git a/src/blackmisc/obfuscation.h b/src/blackmisc/obfuscation.h index 51d494d8e..26fadb6e7 100644 --- a/src/blackmisc/obfuscation.h +++ b/src/blackmisc/obfuscation.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_OBFUSCATION_H #define BLACKMISC_OBFUSCATION_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" #include namespace BlackMisc diff --git a/src/blackmisc/orderable.cpp b/src/blackmisc/orderable.cpp index 40d54a408..6b54e2b62 100644 --- a/src/blackmisc/orderable.cpp +++ b/src/blackmisc/orderable.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/comparefunctions.h" #include "blackmisc/orderable.h" +#include "blackmisc/comparefunctions.h" #include "blackmisc/variant.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/platform.cpp b/src/blackmisc/platform.cpp index 6f8864c64..a987c988a 100644 --- a/src/blackmisc/platform.cpp +++ b/src/blackmisc/platform.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "platform.h" +#include "blackmisc/platform.h" #include "blackmisc/icons.h" #include "blackmisc/stringutils.h" #include "blackmisc/comparefunctions.h" diff --git a/src/blackmisc/platform.h b/src/blackmisc/platform.h index 952879b96..3bad97e63 100644 --- a/src/blackmisc/platform.h +++ b/src/blackmisc/platform.h @@ -12,7 +12,6 @@ #define BLACKMISC_PLATFORM_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/db/datastore.h" #include "blackmisc/icon.h" #include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" diff --git a/src/blackmisc/platformset.cpp b/src/blackmisc/platformset.cpp index df1815490..4509e273c 100644 --- a/src/blackmisc/platformset.cpp +++ b/src/blackmisc/platformset.cpp @@ -8,7 +8,7 @@ //! \cond PRIVATE -#include "platformset.h" +#include "blackmisc/platformset.h" #include "blackmisc/containerbase.h" #include "blackmisc/dbus.h" #include "blackmisc/variant.h" diff --git a/src/blackmisc/platformset.h b/src/blackmisc/platformset.h index 640dd94a2..54cdbe8e6 100644 --- a/src/blackmisc/platformset.h +++ b/src/blackmisc/platformset.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_PLATFORMSET_H #define BLACKMISC_PLATFORMSET_H -#include "platform.h" +#include "blackmisc/platform.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" diff --git a/src/blackmisc/predicates.h b/src/blackmisc/predicates.h index 555858e03..98984dd7a 100644 --- a/src/blackmisc/predicates.h +++ b/src/blackmisc/predicates.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_PREDICATES_H #define BLACKMISC_PREDICATES_H -#include "integersequence.h" -#include "algorithm.h" +#include "blackmisc/integersequence.h" +#include "blackmisc/algorithm.h" #include #include diff --git a/src/blackmisc/processctrl.h b/src/blackmisc/processctrl.h index 0fe33cefc..42a51a6eb 100644 --- a/src/blackmisc/processctrl.h +++ b/src/blackmisc/processctrl.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_PROCESS_H #define BLACKMISC_PROCESS_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" #include namespace BlackMisc diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp index c417c4697..13b854486 100644 --- a/src/blackmisc/propertyindexvariantmap.cpp +++ b/src/blackmisc/propertyindexvariantmap.cpp @@ -8,8 +8,8 @@ //! \cond PRIVATE -#include "blackmisc/dictionary.h" #include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/dictionary.h" #include #include diff --git a/src/blackmisc/range.h b/src/blackmisc/range.h index c52bfd7e9..fa73386b5 100644 --- a/src/blackmisc/range.h +++ b/src/blackmisc/range.h @@ -11,11 +11,11 @@ #ifndef BLACKMISC_RANGE_H #define BLACKMISC_RANGE_H -#include "blackmiscexport.h" -#include "iterator.h" -#include "predicates.h" -#include "algorithm.h" -#include "typetraits.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/iterator.h" +#include "blackmisc/predicates.h" +#include "blackmisc/algorithm.h" +#include "blackmisc/typetraits.h" #include #include #include diff --git a/src/blackmisc/registermetadata.cpp b/src/blackmisc/registermetadata.cpp index 75f544e60..bcede8f6d 100644 --- a/src/blackmisc/registermetadata.cpp +++ b/src/blackmisc/registermetadata.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadata.h" +#include "blackmisc/registermetadata.h" #include "blackmisc/simulation/registermetadatasimulation.h" #include "blackmisc/weather/registermetadataweather.h" #include "blackmisc/network/registermetadatanetwork.h" diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 0b030b709..760582e8b 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_SEQUENCE_H #define BLACKMISC_SEQUENCE_H -#include "containerbase.h" -#include "propertyindex.h" -#include "icon.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/icon.h" #include #include #include diff --git a/src/blackmisc/settingscache.cpp b/src/blackmisc/settingscache.cpp index a06970c41..87a6a3775 100644 --- a/src/blackmisc/settingscache.cpp +++ b/src/blackmisc/settingscache.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/settingscache.h" #include "blackmisc/directoryutils.h" #include "blackmisc/logmessage.h" -#include "blackmisc/settingscache.h" #include diff --git a/src/blackmisc/simplecommandparser.cpp b/src/blackmisc/simplecommandparser.cpp index 688fc5ef2..8431800c6 100644 --- a/src/blackmisc/simplecommandparser.cpp +++ b/src/blackmisc/simplecommandparser.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/simplecommandparser.h" #include "blackmisc/pq/pqstring.h" #include "blackmisc/stringutils.h" -#include "blackmisc/simplecommandparser.h" #include #include diff --git a/src/blackmisc/simulation/aircraftmatchersetup.cpp b/src/blackmisc/simulation/aircraftmatchersetup.cpp index f2b4c78d8..a318e2154 100644 --- a/src/blackmisc/simulation/aircraftmatchersetup.cpp +++ b/src/blackmisc/simulation/aircraftmatchersetup.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "aircraftmatchersetup.h" +#include "blackmisc/simulation/aircraftmatchersetup.h" #include namespace BlackMisc diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 86dca35fc..e8b229857 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -6,15 +6,15 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "statusmessage.h" -#include "statusexception.h" -#include "propertyindex.h" -#include "iconlist.h" -#include "loghandler.h" -#include "logmessage.h" -#include "comparefunctions.h" -#include "stringutils.h" -#include "verify.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusexception.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/loghandler.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/comparefunctions.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/verify.h" #include #include diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index d6d44ca5b..98be0d3f4 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -11,14 +11,14 @@ #ifndef BLACKMISC_STATUSMESSAGE_H #define BLACKMISC_STATUSMESSAGE_H -#include "logcategorylist.h" -#include "timestampbased.h" -#include "orderable.h" -#include "icon.h" -#include "propertyindex.h" -#include "stringutils.h" -#include "typetraits.h" -#include "blackmiscexport.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/timestampbased.h" +#include "blackmisc/orderable.h" +#include "blackmisc/icon.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/typetraits.h" +#include "blackmisc/blackmiscexport.h" #include diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index d8159ba02..c67805cd9 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -8,9 +8,9 @@ //! \cond PRIVATE +#include "blackmisc/statusmessagelist.h" #include "blackmisc/compare.h" #include "blackmisc/range.h" -#include "blackmisc/statusmessagelist.h" #include #include diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index c2e85e797..64aa2abba 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -8,7 +8,7 @@ //! \cond PRIVATE -#include "stringutils.h" +#include "blackmisc/stringutils.h" #include #include #include diff --git a/src/blackmisc/timestampbased.cpp b/src/blackmisc/timestampbased.cpp index 5b69d1813..85f4dbd85 100644 --- a/src/blackmisc/timestampbased.cpp +++ b/src/blackmisc/timestampbased.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/comparefunctions.h" #include "blackmisc/timestampbased.h" +#include "blackmisc/comparefunctions.h" #include "blackmisc/stringutils.h" #include "blackmisc/variant.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp index a47f32620..521118ebf 100644 --- a/src/blackmisc/timestampobjectlist.cpp +++ b/src/blackmisc/timestampobjectlist.cpp @@ -8,6 +8,7 @@ //! \cond PRIVATE +#include "blackmisc/timestampobjectlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" #include "blackmisc/aviation/aircraftsituationchangelist.h" @@ -27,7 +28,6 @@ #include "blackmisc/simulation/distributorlist.h" #include "blackmisc/simulation/matchingstatistics.h" #include "blackmisc/statusmessagelist.h" -#include "blackmisc/timestampobjectlist.h" #include "blackmisc/predicates.h" #include "blackmisc/identifierlist.h" #include "blackmisc/countrylist.h" diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 594953610..6f55a8a66 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -11,17 +11,17 @@ #ifndef BLACKMISC_VALUEOBJECT_H #define BLACKMISC_VALUEOBJECT_H -#include "blackmiscexport.h" -#include "dbus.h" -#include "datastream.h" -#include "metaclass.h" -#include "json.h" -#include "compare.h" -#include "variant.h" -#include "propertyindexvariantmap.h" -#include "iconlist.h" -#include "dictionary.h" -#include "stringutils.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/dbus.h" +#include "blackmisc/datastream.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/json.h" +#include "blackmisc/compare.h" +#include "blackmisc/variant.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/stringutils.h" #include #include diff --git a/src/blackmisc/variant.cpp b/src/blackmisc/variant.cpp index 86be9dd29..28758b763 100644 --- a/src/blackmisc/variant.cpp +++ b/src/blackmisc/variant.cpp @@ -8,6 +8,7 @@ //! \cond PRIVATE +#include "blackmisc/variant.h" #include "blackmisc/imageutils.h" #include "blackmisc/dictionary.h" #include "blackmisc/icon.h" @@ -15,7 +16,6 @@ #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" #include "blackmisc/variantlist.h" -#include "blackmisc/variant.h" #include #include diff --git a/src/blackmisc/windllutils.cpp b/src/blackmisc/windllutils.cpp index 1fc8c9e50..69951bd72 100644 --- a/src/blackmisc/windllutils.cpp +++ b/src/blackmisc/windllutils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "windllutils.h" +#include "blackmisc/windllutils.h" #include #include #include diff --git a/src/blackmisc/windllutils.h b/src/blackmisc/windllutils.h index 5faa7c235..367eb7e0b 100644 --- a/src/blackmisc/windllutils.h +++ b/src/blackmisc/windllutils.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_WINDLLUTILS_H #define BLACKMISC_WINDLLUTILS_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" #include namespace BlackMisc diff --git a/src/blackmisc/worker.cpp b/src/blackmisc/worker.cpp index 52ad1fc94..47c5a6e7f 100644 --- a/src/blackmisc/worker.cpp +++ b/src/blackmisc/worker.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/threadutils.h" #include "blackmisc/worker.h" +#include "blackmisc/threadutils.h" #include "blackmisc/verify.h" #include "blackmisc/logmessage.h"