Issue #77 Include style

src/blackmisc/algorithm.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_ALGORITHM_H
 #define BLACKMISC_ALGORITHM_H
 
-#include "integersequence.h"
+#include "blackmisc/integersequence.h"
 
 #include <QThreadStorage>
 #include <QRandomGenerator>

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;

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
 {

src/blackmisc/audio/audiosettings.cpp

@@ -7,15 +7,13 @@
  */
 
 #include "blackmisc/audio/audiosettings.h"
-
+#include "blackmisc/directoryutils.h"
+#include "blackmisc/fileutils.h"
 #include <QChar>
 #include <QtGlobal>
 #include <QStringBuilder>
 #include <QDir>
 
-#include "blackmisc/directoryutils.h"
-#include "blackmisc/fileutils.h"
-
 using namespace BlackMisc::Audio;
 
 namespace BlackMisc

src/blackmisc/cachesettingsutils.cpp

@@ -6,9 +6,9 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "cachesettingsutils.h"
+#include "blackmisc/cachesettingsutils.h"
-#include "settingscache.h"
+#include "blackmisc/settingscache.h"
-#include "datacache.h"
+#include "blackmisc/datacache.h"
 #include <QRegularExpression>
 
 namespace BlackMisc

src/blackmisc/cachesettingsutils.h

@@ -12,7 +12,7 @@
 #define BLACKMISC_CACHESETTINGSUTILS_H
 
 #include "blackmisc/applicationinfo.h"
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
 #include <QString>
 
 namespace BlackMisc

src/blackmisc/collection.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_COLLECTION_H
 #define BLACKMISC_COLLECTION_H
 
-#include "containerbase.h"
+#include "blackmisc/containerbase.h"
-#include "datastream.h"
+#include "blackmisc/datastream.h"
-#include "icon.h"
+#include "blackmisc/icon.h"
 #include <QMap>
 #include <algorithm>
 #include <type_traits>

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
 {

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 <QFileInfo>
 #include <QProcess>

src/blackmisc/containerbase.h

@@ -11,11 +11,11 @@
 #ifndef BLACKMISC_CONTAINERBASE_H
 #define BLACKMISC_CONTAINERBASE_H
 
-#include "range.h"
+#include "blackmisc/range.h"
-#include "predicates.h"
+#include "blackmisc/predicates.h"
-#include "json.h"
+#include "blackmisc/json.h"
-#include "variant.h"
+#include "blackmisc/variant.h"
-#include "dbus.h"
+#include "blackmisc/dbus.h"
 
 #include <algorithm>
 #include <QStringList>

src/blackmisc/crashhandler.cpp

@@ -6,13 +6,12 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "crashhandler.h"
+#include "blackmisc/crashhandler.h"
-
-#include "blackconfig/buildconfig.h"
 #include "blackmisc/appstarttime.h"
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/filelogger.h"
+#include "blackconfig/buildconfig.h"
 
 #include <QCoreApplication>
 #include <QFileInfo>

src/blackmisc/crashinfo.cpp

@@ -7,7 +7,7 @@
 */
 
 #include "blackmisc/crashinfo.h"
-#include "fileutils.h"
+#include "blackmisc/fileutils.h"
 
 #include <QFile>
 #include <QStringBuilder>

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"

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 <QDBusConnection>

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 <QString>

src/blackmisc/digestsignal.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "digestsignal.h"
+#include "blackmisc/digestsignal.h"
-#include "threadutils.h"
+#include "blackmisc/threadutils.h"
 #include <QPointer>
 
 namespace BlackMisc

src/blackmisc/directories.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "blackmisc/directories.h"
-#include "directoryutils.h"
+#include "blackmisc/directoryutils.h"
 #include <QFileInfo>
 #include <QDir>
 

src/blackmisc/directoryutils.cpp

@@ -8,10 +8,10 @@
 
 //! \cond PRIVATE
 
-#include "directoryutils.h"
+#include "blackmisc/directoryutils.h"
-#include "fileutils.h"
+#include "blackmisc/fileutils.h"
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"
-#include "range.h"
+#include "blackmisc/range.h"
 #include "blackconfig/buildconfig.h"
 #include <QCoreApplication>
 #include <QDir>

src/blackmisc/directoryutils.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_DIRECTORYUTILS_H
 #define BLACKMISC_DIRECTORYUTILS_H
 
-#include "applicationinfo.h"
+#include "blackmisc/applicationinfo.h"
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
 #include <QMap>
 #include <QSet>
 #include <QString>

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 <QCoreApplication>
 #include <QDateTime>

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"
 

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 <QDBusAbstractInterface>
 #include <QDBusPendingCall>

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 <QStringBuilder>
 
 namespace BlackMisc

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 <QDBusMetaType>

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 <QIcon>

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 <QString>
 #include <tuple>

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 <QBuffer>

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 <QMetaType>
 #include <type_traits>
 

src/blackmisc/iterator.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_ITERATOR_H
 #define BLACKMISC_ITERATOR_H
 
-#include "optional.h"
+#include "blackmisc/optional.h"
-#include "typetraits.h"
+#include "blackmisc/typetraits.h"
 #include <algorithm>
 #include <type_traits>
 #include <iterator>

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"
 

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 <QtGlobal>
 #include <QString>
 #include <vector>

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
 {

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"
 

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"
 

src/blackmisc/logmessage.cpp

@@ -8,7 +8,7 @@
 
 //! \cond PRIVATE
 
-#include "logmessage.h"
+#include "blackmisc/logmessage.h"
 
 namespace BlackMisc
 {

src/blackmisc/logmessage.h

@@ -11,11 +11,11 @@
 
 //! \file
 
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
-#include "statusmessagelist.h"
+#include "blackmisc/statusmessagelist.h"
-#include "statusmessage.h"
+#include "blackmisc/statusmessage.h"
-#include "logcategorylist.h"
+#include "blackmisc/logcategorylist.h"
-#include "integersequence.h"
+#include "blackmisc/integersequence.h"
 #include <QDebug>
 #include <QLoggingCategory>
 #include <QList>

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 <QHash>

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 <QMetaType>
 #include <QMetaObject>

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"

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

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 <QStringBuilder>
 

src/blackmisc/obfuscation.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_OBFUSCATION_H
 #define BLACKMISC_OBFUSCATION_H
 
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
 #include <QString>
 
 namespace BlackMisc

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"
 

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"

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"

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"

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"

src/blackmisc/predicates.h

@@ -11,8 +11,8 @@
 #ifndef BLACKMISC_PREDICATES_H
 #define BLACKMISC_PREDICATES_H
 
-#include "integersequence.h"
+#include "blackmisc/integersequence.h"
-#include "algorithm.h"
+#include "blackmisc/algorithm.h"
 
 #include <QObject>
 #include <functional>

src/blackmisc/processctrl.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_PROCESS_H
 #define BLACKMISC_PROCESS_H
 
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
 #include <QProcess>
 
 namespace BlackMisc

src/blackmisc/propertyindexvariantmap.cpp

@@ -8,8 +8,8 @@
 
 //! \cond PRIVATE
 
-#include "blackmisc/dictionary.h"
 #include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/dictionary.h"
 
 #include <QHash>
 #include <tuple>

src/blackmisc/range.h

@@ -11,11 +11,11 @@
 #ifndef BLACKMISC_RANGE_H
 #define BLACKMISC_RANGE_H
 
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
-#include "iterator.h"
+#include "blackmisc/iterator.h"
-#include "predicates.h"
+#include "blackmisc/predicates.h"
-#include "algorithm.h"
+#include "blackmisc/algorithm.h"
-#include "typetraits.h"
+#include "blackmisc/typetraits.h"
 #include <QtGlobal>
 #include <QDebug>
 #include <algorithm>

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"

src/blackmisc/sequence.h

@@ -11,9 +11,9 @@
 #ifndef BLACKMISC_SEQUENCE_H
 #define BLACKMISC_SEQUENCE_H
 
-#include "containerbase.h"
+#include "blackmisc/containerbase.h"
-#include "propertyindex.h"
+#include "blackmisc/propertyindex.h"
-#include "icon.h"
+#include "blackmisc/icon.h"
 #include <QVector>
 #include <algorithm>
 #include <type_traits>

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 <QStandardPaths>
 

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 <QList>
 #include <QSet>

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 <QStringBuilder>
 
 namespace BlackMisc

src/blackmisc/statusmessage.cpp

@@ -6,15 +6,15 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "statusmessage.h"
+#include "blackmisc/statusmessage.h"
-#include "statusexception.h"
+#include "blackmisc/statusexception.h"
-#include "propertyindex.h"
+#include "blackmisc/propertyindex.h"
-#include "iconlist.h"
+#include "blackmisc/iconlist.h"
-#include "loghandler.h"
+#include "blackmisc/loghandler.h"
-#include "logmessage.h"
+#include "blackmisc/logmessage.h"
-#include "comparefunctions.h"
+#include "blackmisc/comparefunctions.h"
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"
-#include "verify.h"
+#include "blackmisc/verify.h"
 
 #include <QMetaEnum>
 #include <QStringBuilder>

src/blackmisc/statusmessage.h

@@ -11,14 +11,14 @@
 #ifndef BLACKMISC_STATUSMESSAGE_H
 #define BLACKMISC_STATUSMESSAGE_H
 
-#include "logcategorylist.h"
+#include "blackmisc/logcategorylist.h"
-#include "timestampbased.h"
+#include "blackmisc/timestampbased.h"
-#include "orderable.h"
+#include "blackmisc/orderable.h"
-#include "icon.h"
+#include "blackmisc/icon.h"
-#include "propertyindex.h"
+#include "blackmisc/propertyindex.h"
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"
-#include "typetraits.h"
+#include "blackmisc/typetraits.h"
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
 
 #include <QReadWriteLock>
 

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 <QJsonObject>
 #include <QJsonValue>

src/blackmisc/stringutils.cpp

@@ -8,7 +8,7 @@
 
 //! \cond PRIVATE
 
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"
 #include <QChar>
 #include <QTextCodec>
 #include <QStringBuilder>

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"

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"

src/blackmisc/valueobject.h

@@ -11,17 +11,17 @@
 #ifndef BLACKMISC_VALUEOBJECT_H
 #define BLACKMISC_VALUEOBJECT_H
 
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
-#include "dbus.h"
+#include "blackmisc/dbus.h"
-#include "datastream.h"
+#include "blackmisc/datastream.h"
-#include "metaclass.h"
+#include "blackmisc/metaclass.h"
-#include "json.h"
+#include "blackmisc/json.h"
-#include "compare.h"
+#include "blackmisc/compare.h"
-#include "variant.h"
+#include "blackmisc/variant.h"
-#include "propertyindexvariantmap.h"
+#include "blackmisc/propertyindexvariantmap.h"
-#include "iconlist.h"
+#include "blackmisc/iconlist.h"
-#include "dictionary.h"
+#include "blackmisc/dictionary.h"
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"
 
 #include <QtDBus/QDBusMetaType>
 #include <QString>

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 <QByteArray>
 #include <QChar>

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 <QDir>
 #include <QtGlobal>
 #include <QCoreApplication>

src/blackmisc/windllutils.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_WINDLLUTILS_H
 #define BLACKMISC_WINDLLUTILS_H
 
-#include "blackmiscexport.h"
+#include "blackmisc/blackmiscexport.h"
 #include <QString>
 
 namespace BlackMisc

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"