Issue #77 Break cyclic dependency between CLogCategory and numerous classes

src/blackcore/afv/audio/receiversampleprovider.h

@@ -17,7 +17,7 @@
 #include "blacksound/sampleprovider/sinusgenerator.h"
 #include "blacksound/sampleprovider/volumesampleprovider.h"
 
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/audio/audiosettings.h"
 

src/blackcore/afv/clients/afvclient.h

@@ -24,7 +24,7 @@
 #include "blackmisc/audio/audiosettings.h"
 #include "blackmisc/audio/ptt.h"
 #include "blackmisc/audio/audiodeviceinfo.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/identifiable.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/worker.h"

src/blackcore/afv/connection/apiserverconnection.h

@@ -15,7 +15,7 @@
 #include "blackcore/application.h"
 #include "blackmisc/slot.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <QString>
 #include <QNetworkAccessManager>

src/blackcore/afv/connection/clientconnectiondata.h

@@ -13,7 +13,7 @@
 
 #include "blackcore/afv/dto.h"
 #include "apiserverconnection.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackcore/afv/crypto/cryptodtochannel.h"
 
 #include <QDateTime>

src/blackcore/aircraftmatcher.cpp

@@ -18,8 +18,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/fileutils.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/swiftdirectories.h"

src/blackcore/application.cpp

@@ -28,8 +28,7 @@
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/eventloop.h"
 #include "blackmisc/filelogger.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/logpattern.h"

src/blackcore/context/context.cpp

@@ -8,7 +8,7 @@
 
 #include "blackcore/context/context.h"
 #include "blackcore/application.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 using namespace BlackMisc;
 

src/blackcore/context/context.h

@@ -14,7 +14,7 @@
 #include "blackcore/corefacade.h"
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/blackcoreexport.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/statusmessage.h"
 

src/blackcore/context/contextapplication.cpp

@@ -15,7 +15,7 @@
 #include "blackcore/inputmanager.h"
 #include "blackmisc/dbus.h"
 #include "blackmisc/dbusserver.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/statusmessage.h"

src/blackcore/context/contextapplicationimpl.cpp

@@ -10,7 +10,7 @@
 #include "blackcore/context/contextapplicationimpl.h"
 #include "blackcore/inputmanager.h"
 #include "blackmisc/dbusserver.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/simplecommandparser.h"

src/blackcore/context/contextnetworkimpl.cpp

@@ -31,7 +31,7 @@
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/dbusserver.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/simplecommandparser.h"

src/blackcore/context/contextownaircraftimpl.cpp

@@ -32,7 +32,7 @@
 #include "blackmisc/simplecommandparser.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/dbusserver.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/statusmessage.h"

src/blackcore/context/contextsimulatorimpl.cpp

@@ -28,7 +28,7 @@
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/dbusserver.h"
 #include "blackmisc/simplecommandparser.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/statusmessage.h"

src/blackcore/db/databaseauthentication.cpp

@@ -10,7 +10,7 @@
 #include "blackcore/data/globalsetup.h"
 #include "blackcore/db/databaseauthentication.h"
 #include "blackmisc/json.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/network/authenticateduser.h"
 #include "blackmisc/network/networkutils.h"

src/blackcore/db/databaseauthentication.h

@@ -14,7 +14,7 @@
 #include "blackcore/data/authenticateduser.h"
 #include "blackcore/blackcoreexport.h"
 #include "blackmisc/datacache.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/statusmessagelist.h"
 
 #include <QObject>

src/blackcore/db/databasereader.cpp

@@ -17,8 +17,7 @@
 #include "blackmisc/network/entityflags.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/verify.h"
 

src/blackcore/db/databasewriter.cpp

@@ -13,8 +13,7 @@
 #include "blackmisc/simulation/autopublishdata.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/db/datastoreutility.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategory.h"
 #include "blackmisc/statusmessage.h"
 
 #include <QStringBuilder>

src/blackcore/db/networkwatchdog.h

@@ -15,7 +15,7 @@
 #include "blackcore/blackcoreexport.h"
 #include "blackmisc/network/url.h"
 #include "blackmisc/worker.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <atomic>
 #include <QReadWriteLock>

src/blackcore/fsd/serializer.cpp

@@ -9,7 +9,7 @@
 #include "serializer.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackconfig/buildconfig.h"
 
 using namespace BlackConfig;

src/blackcore/setupreader.cpp

@@ -13,8 +13,7 @@
 #include "blackmisc/fileutils.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/network/url.h"

src/blackcore/threadedreader.h

@@ -14,7 +14,7 @@
 #include "blackcore/vatsim/vatsimsettings.h"
 #include "blackcore/blackcoreexport.h"
 #include "blackmisc/network/urlloglist.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/worker.h"
 
 #include <QDateTime>

src/blackcore/webdataservices.cpp

@@ -23,8 +23,7 @@
 #include "blackcore/application.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/fileutils.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/restricted.h"
 #include "blackmisc/statusmessage.h"

src/blackgui/components/dbautostashingcomponent.cpp

@@ -15,8 +15,7 @@
 #include "blackgui/views/statusmessageview.h"
 #include "blackgui/views/viewbase.h"
 #include "blackmisc/aviation/livery.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/aircraftmodellist.h"

src/blackgui/components/dbownmodelsetformdialog.cpp

@@ -11,8 +11,7 @@
 #include "blackgui/components/dbownmodelsetformdialog.h"
 #include "blackgui/editors/ownmodelsetform.h"
 #include "blackgui/guiapplication.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "ui_dbownmodelsetformdialog.h"
 

src/blackgui/components/dbstashcomponent.cpp

@@ -20,7 +20,7 @@
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/livery.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/verify.h"
 #include "dbstashcomponent.h"

src/blackgui/components/firstmodelsetcomponent.h

@@ -17,7 +17,7 @@
 #include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/simulation/aircraftmodelloader.h"
 #include "blackmisc/simulation/simulatorinfo.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include <QFrame>
 #include <QWizardPage>
 

src/blackgui/components/flightplancomponent.cpp

@@ -26,7 +26,7 @@
 #include "blackmisc/pq/pqstring.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/swiftdirectories.h"

src/blackgui/components/flightplancomponent.h

@@ -23,7 +23,7 @@
 #include "blackmisc/datacache.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <QObject>
 #include <QScopedPointer>

src/blackgui/components/interpolationlogdisplay.h

@@ -17,7 +17,7 @@
 #include "blackmisc/simulation/interpolationlogger.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/identifiable.h"
 
 #include <QStringListModel>

src/blackgui/components/settingssimulatorbasicscomponent.h

@@ -14,7 +14,7 @@
 #include "blackgui/overlaymessagesframe.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/simulation/fscommon/fscommonutil.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <QFrame>
 #include <QFileDialog>

src/blackgui/components/settingsxswiftbuscomponent.h

@@ -14,7 +14,7 @@
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/settings/xswiftbussettings.h"
 #include "blackmisc/settingscache.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include <QFrame>
 #include <QScopedPointer>
 

src/blackgui/components/simulatorcomponent.h

@@ -14,7 +14,7 @@
 #include "blackgui/enablefordockwidgetinfoarea.h"
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/simulatorinfo.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/icons.h"
 
 #include <QObject>

src/blackgui/components/statusmessageform.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "blackgui/components/statusmessageform.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "ui_statusmessageform.h"
 
 #include <QLabel>

src/blackgui/guiapplication.cpp

@@ -25,8 +25,7 @@
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/datacache.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/metadatautils.h"

src/blackgui/menus/menudelegate.h

@@ -9,7 +9,7 @@
 #ifndef BLACKGUI_MENUS_MENUDELEGATE_H
 #define BLACKGUI_MENUS_MENUDELEGATE_H
 
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackgui/menus/menuaction.h"
 
 #include <QMenu>

src/blackgui/stylesheetutility.h

@@ -12,7 +12,7 @@
 #define BLACKGUI_STYLESHEETUTILITY_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/restricted.h"
 #include "blackmisc/digestsignal.h"
 

src/blackmisc/audio/voicesetup.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "blackmisc/audio/voicesetup.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/comparefunctions.h"

src/blackmisc/aviation/aircraftcategory.cpp

@@ -9,7 +9,7 @@
 #include "blackmisc/aviation/aircraftcategory.h"
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -11,7 +11,7 @@
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"

src/blackmisc/aviation/airlineicaocode.cpp

@@ -12,8 +12,7 @@
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

src/blackmisc/aviation/airlineicaocodelist.cpp

@@ -8,7 +8,7 @@
 
 #include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackmisc/aviation/logutils.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/country.h"
 #include "blackmisc/range.h"
 

src/blackmisc/aviation/flightplan.h

@@ -23,7 +23,7 @@
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/metaclass.h"

src/blackmisc/aviation/livery.cpp

@@ -11,8 +11,7 @@
 #include "blackmisc/aviation/logutils.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

src/blackmisc/aviation/simbriefdata.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "simbriefdata.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include <QStringBuilder>
 
 using namespace BlackMisc::Network;

src/blackmisc/datacache.h

@@ -16,7 +16,7 @@
 #include "blackmisc/identifier.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/valuecache.h"
 #include "blackmisc/valuecacheprivate.h"
 #include "blackmisc/variant.h"

src/blackmisc/db/datastoreutility.cpp

@@ -7,8 +7,7 @@
  */
 
 #include "blackmisc/db/datastoreutility.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/statusmessage.h"

src/blackmisc/db/datastoreutility.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_DB_DATASTOREUTILITY_H
 #define BLACKMISC_DB_DATASTOREUTILITY_H
 
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QDateTime>

src/blackmisc/dbusserver.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_DBUSSERVER_H
 #define BLACKMISC_DBUSSERVER_H
 
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QDBusConnection>

src/blackmisc/geo/kmlutils.h

@@ -12,7 +12,7 @@
 #define BLACKMISC_GEO_KMLUTILS_H
 
 #include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/blackmiscexport.h"
 
 namespace BlackMisc

src/blackmisc/logmessage.h

@@ -14,7 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/integersequence.h"
 #include <QDebug>
 #include <QLoggingCategory>

src/blackmisc/network/authenticateduser.cpp

@@ -8,8 +8,7 @@
 
 #include "blackmisc/network/authenticateduser.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"

src/blackmisc/network/fsdsetup.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "blackmisc/network/fsdsetup.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

src/blackmisc/network/rawfsdmessage.cpp

@@ -7,8 +7,7 @@
  */
 
 #include "blackmisc/network/rawfsdmessage.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

src/blackmisc/network/server.cpp

@@ -7,8 +7,7 @@
  */
 
 #include "blackmisc/network/server.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategory.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"

src/blackmisc/simulation/aircraftmodel.cpp

@@ -12,8 +12,7 @@
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/fileutils.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategory.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/verify.h"

src/blackmisc/simulation/autopublishdata.cpp

@@ -10,7 +10,7 @@
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/json.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <QStringList>
 #include <QStringBuilder>

src/blackmisc/simulation/distributor.cpp

@@ -6,8 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/simulation/distributor.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

src/blackmisc/simulation/fscommon/fscommonutil.h

@@ -12,7 +12,7 @@
 #define BLACKMISC_SIMULATION_FSCOMMONUTIL_H
 
 #include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <atomic>

src/blackmisc/simulation/interpolationlogger.h

@@ -16,7 +16,7 @@
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/aircraftpartslist.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <QObject>
 #include <QStringList>

src/blackmisc/simulation/interpolator.h

@@ -20,7 +20,7 @@
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/aircraftpartslist.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/statusmessagelist.h"
 
 #include <QObject>

src/blackmisc/simulation/xplane/xplaneutil.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_SIMULATION_XPLANE_XPLANEUTIL_H
 #define BLACKMISC_SIMULATION_XPLANE_XPLANEUTIL_H
 
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QStringList>

src/blackmisc/valuecache.cpp

@@ -14,8 +14,7 @@
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/lockfree.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 
 #include <QByteArray>

src/blackmisc/worker.h

@@ -13,7 +13,7 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/connectionguard.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/invoke.h"
 #include "blackmisc/promise.h"
 #include "blackmisc/stacktrace.h"

src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h

@@ -14,7 +14,7 @@
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/weather/weathergrid.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/identifiable.h"
 
 #include <QDialog>

src/plugins/simulator/fsxcommon/simconnectsymbols.cpp

@@ -9,7 +9,7 @@
 #include "simconnectsymbols.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
 #include <QLibrary>
 #include <Windows.h>
 #include <SimConnect.h>

src/plugins/simulator/xplane/xswiftbustrafficproxy.h

@@ -16,7 +16,7 @@
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/geo/elevationplane.h"
-#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 
 #include <QObject>
 #include <QString>

src/swiftguistandard/swiftguistd.cpp

@@ -28,8 +28,7 @@
 #include "blackcore/corefacadeconfig.h"
 #include "blackmisc/audio/notificationsounds.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategories.h"
-#include "blackmisc/logcategorylist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/threadutils.h"
 #include "blackconfig/buildconfig.h"