diff --git a/src/blackcore/afv/audio/receiversampleprovider.h b/src/blackcore/afv/audio/receiversampleprovider.h index 98a4689cf..cc0de44c7 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.h +++ b/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" diff --git a/src/blackcore/afv/clients/afvclient.h b/src/blackcore/afv/clients/afvclient.h index 1b472d536..51a75d219 100644 --- a/src/blackcore/afv/clients/afvclient.h +++ b/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" diff --git a/src/blackcore/afv/connection/apiserverconnection.h b/src/blackcore/afv/connection/apiserverconnection.h index 755017b2e..c8638f920 100644 --- a/src/blackcore/afv/connection/apiserverconnection.h +++ b/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 #include diff --git a/src/blackcore/afv/connection/clientconnectiondata.h b/src/blackcore/afv/connection/clientconnectiondata.h index 03837ee3d..6209846d4 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.h +++ b/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 diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index cdc67aeff..4e771e43d 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/swiftdirectories.h" diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 90819878d..50fe21bd4 100644 --- a/src/blackcore/application.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/loghandler.h" #include "blackmisc/logmessage.h" #include "blackmisc/logpattern.h" diff --git a/src/blackcore/context/context.cpp b/src/blackcore/context/context.cpp index 8e4ad964f..79b1ca0d7 100644 --- a/src/blackcore/context/context.cpp +++ b/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; diff --git a/src/blackcore/context/context.h b/src/blackcore/context/context.h index f5750dc96..d9f76672d 100644 --- a/src/blackcore/context/context.h +++ b/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" diff --git a/src/blackcore/context/contextapplication.cpp b/src/blackcore/context/contextapplication.cpp index cad55bd22..8a325bc56 100644 --- a/src/blackcore/context/contextapplication.cpp +++ b/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" diff --git a/src/blackcore/context/contextapplicationimpl.cpp b/src/blackcore/context/contextapplicationimpl.cpp index b88419613..a0ab75ba2 100644 --- a/src/blackcore/context/contextapplicationimpl.cpp +++ b/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" diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index d8259d6b9..ba15e05ab 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/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" diff --git a/src/blackcore/context/contextownaircraftimpl.cpp b/src/blackcore/context/contextownaircraftimpl.cpp index cd59d5d2e..0cc50f9b7 100644 --- a/src/blackcore/context/contextownaircraftimpl.cpp +++ b/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" diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 2401b7d2f..9fa04c10e 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/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" diff --git a/src/blackcore/db/databaseauthentication.cpp b/src/blackcore/db/databaseauthentication.cpp index d57ebb4fb..8ad6a85e8 100644 --- a/src/blackcore/db/databaseauthentication.cpp +++ b/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" diff --git a/src/blackcore/db/databaseauthentication.h b/src/blackcore/db/databaseauthentication.h index 4ee0102dc..2fff029e5 100644 --- a/src/blackcore/db/databaseauthentication.h +++ b/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 diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 3ffe83872..2c2f13fbd 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" diff --git a/src/blackcore/db/databasewriter.cpp b/src/blackcore/db/databasewriter.cpp index c13f60c78..3e50a1738 100644 --- a/src/blackcore/db/databasewriter.cpp +++ b/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/logcategory.h" +#include "blackmisc/logcategories.h" #include "blackmisc/statusmessage.h" #include diff --git a/src/blackcore/db/networkwatchdog.h b/src/blackcore/db/networkwatchdog.h index 8590f0613..6114b61c7 100644 --- a/src/blackcore/db/networkwatchdog.h +++ b/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 #include diff --git a/src/blackcore/fsd/serializer.cpp b/src/blackcore/fsd/serializer.cpp index 41791196a..b975eab40 100644 --- a/src/blackcore/fsd/serializer.cpp +++ b/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; diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index 5dd1ed956..65492a102 100644 --- a/src/blackcore/setupreader.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/network/url.h" diff --git a/src/blackcore/threadedreader.h b/src/blackcore/threadedreader.h index 81a09410a..ca2f0c7e5 100644 --- a/src/blackcore/threadedreader.h +++ b/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 diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 1d28b2db5..2906b09cb 100644 --- a/src/blackcore/webdataservices.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/restricted.h" #include "blackmisc/statusmessage.h" diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/blackgui/components/dbautostashingcomponent.cpp index 448d3bc2f..ce57b9e99 100644 --- a/src/blackgui/components/dbautostashingcomponent.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/sequence.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodellist.h" diff --git a/src/blackgui/components/dbownmodelsetformdialog.cpp b/src/blackgui/components/dbownmodelsetformdialog.cpp index 1a4f94197..f80f60272 100644 --- a/src/blackgui/components/dbownmodelsetformdialog.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/simulation/distributorlist.h" #include "ui_dbownmodelsetformdialog.h" diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 6b01e3198..b439ffb66 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/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" diff --git a/src/blackgui/components/firstmodelsetcomponent.h b/src/blackgui/components/firstmodelsetcomponent.h index 0c0d43e23..587124941 100644 --- a/src/blackgui/components/firstmodelsetcomponent.h +++ b/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 #include diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 196654d0f..bb3b7c2db 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/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" diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index f0f09234d..e0365aa92 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/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 #include diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index dc8c46295..870da6bda 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/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 diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.h b/src/blackgui/components/settingssimulatorbasicscomponent.h index 9966d52da..b90f6f5fd 100644 --- a/src/blackgui/components/settingssimulatorbasicscomponent.h +++ b/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 #include diff --git a/src/blackgui/components/settingsxswiftbuscomponent.h b/src/blackgui/components/settingsxswiftbuscomponent.h index 6732e0444..7914af928 100644 --- a/src/blackgui/components/settingsxswiftbuscomponent.h +++ b/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 #include diff --git a/src/blackgui/components/simulatorcomponent.h b/src/blackgui/components/simulatorcomponent.h index f88ff786a..d7306fd7c 100644 --- a/src/blackgui/components/simulatorcomponent.h +++ b/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 diff --git a/src/blackgui/components/statusmessageform.cpp b/src/blackgui/components/statusmessageform.cpp index 89d06aaa7..1a91a2de0 100644 --- a/src/blackgui/components/statusmessageform.cpp +++ b/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 diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 15d798a8b..fa48dbdf1 100644 --- a/src/blackgui/guiapplication.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/loghandler.h" #include "blackmisc/metadatautils.h" diff --git a/src/blackgui/menus/menudelegate.h b/src/blackgui/menus/menudelegate.h index 8d984d597..56cd08c7d 100644 --- a/src/blackgui/menus/menudelegate.h +++ b/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 diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h index d2994146b..6f8f6128c 100644 --- a/src/blackgui/stylesheetutility.h +++ b/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" diff --git a/src/blackmisc/audio/voicesetup.cpp b/src/blackmisc/audio/voicesetup.cpp index bad83274d..ec38842a3 100644 --- a/src/blackmisc/audio/voicesetup.cpp +++ b/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" diff --git a/src/blackmisc/aviation/aircraftcategory.cpp b/src/blackmisc/aviation/aircraftcategory.cpp index 906f55d42..f9fdd9fd0 100644 --- a/src/blackmisc/aviation/aircraftcategory.cpp +++ b/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" diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index f3d796b2c..e6b37e5e6 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/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" diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 15393c593..fdee829d4 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" diff --git a/src/blackmisc/aviation/airlineicaocodelist.cpp b/src/blackmisc/aviation/airlineicaocodelist.cpp index a99baebde..877a2de2a 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.cpp +++ b/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" diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 107553428..3759f4d02 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/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" diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index 34f055f2d..275df3a23 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" diff --git a/src/blackmisc/aviation/simbriefdata.cpp b/src/blackmisc/aviation/simbriefdata.cpp index 2939bcdf8..80189df0c 100644 --- a/src/blackmisc/aviation/simbriefdata.cpp +++ b/src/blackmisc/aviation/simbriefdata.cpp @@ -7,7 +7,7 @@ */ #include "simbriefdata.h" -#include "blackmisc/logcategorylist.h" +#include "blackmisc/logcategories.h" #include using namespace BlackMisc::Network; diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h index 1302aeaa8..dfce7d360 100644 --- a/src/blackmisc/datacache.h +++ b/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" diff --git a/src/blackmisc/db/datastoreutility.cpp b/src/blackmisc/db/datastoreutility.cpp index 9e7f4b67d..b7b7660cc 100644 --- a/src/blackmisc/db/datastoreutility.cpp +++ b/src/blackmisc/db/datastoreutility.cpp @@ -7,8 +7,7 @@ */ #include "blackmisc/db/datastoreutility.h" -#include "blackmisc/logcategory.h" -#include "blackmisc/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/statusmessage.h" diff --git a/src/blackmisc/db/datastoreutility.h b/src/blackmisc/db/datastoreutility.h index 1958b2076..69dd8f2e8 100644 --- a/src/blackmisc/db/datastoreutility.h +++ b/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 diff --git a/src/blackmisc/dbusserver.h b/src/blackmisc/dbusserver.h index f9c9bf661..7de460957 100644 --- a/src/blackmisc/dbusserver.h +++ b/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 diff --git a/src/blackmisc/geo/kmlutils.h b/src/blackmisc/geo/kmlutils.h index 0f636455d..3878a3c54 100644 --- a/src/blackmisc/geo/kmlutils.h +++ b/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 diff --git a/src/blackmisc/logmessage.h b/src/blackmisc/logmessage.h index 4117ccfb1..2dcf92183 100644 --- a/src/blackmisc/logmessage.h +++ b/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 #include diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp index 7017eaeab..c8726f586 100644 --- a/src/blackmisc/network/authenticateduser.cpp +++ b/src/blackmisc/network/authenticateduser.cpp @@ -8,8 +8,7 @@ #include "blackmisc/network/authenticateduser.h" #include "blackmisc/icons.h" -#include "blackmisc/logcategory.h" -#include "blackmisc/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" #include "blackmisc/variant.h" diff --git a/src/blackmisc/network/fsdsetup.cpp b/src/blackmisc/network/fsdsetup.cpp index 5951b55b7..0530135cc 100644 --- a/src/blackmisc/network/fsdsetup.cpp +++ b/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" diff --git a/src/blackmisc/network/rawfsdmessage.cpp b/src/blackmisc/network/rawfsdmessage.cpp index e40362f4d..4fee6ec68 100644 --- a/src/blackmisc/network/rawfsdmessage.cpp +++ b/src/blackmisc/network/rawfsdmessage.cpp @@ -7,8 +7,7 @@ */ #include "blackmisc/network/rawfsdmessage.h" -#include "blackmisc/logcategory.h" -#include "blackmisc/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index e9ea229d0..1f488fd97 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -7,8 +7,7 @@ */ #include "blackmisc/network/server.h" -#include "blackmisc/logcategorylist.h" -#include "blackmisc/logcategory.h" +#include "blackmisc/logcategories.h" #include "blackmisc/stringutils.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index e005a6684..044042ed3 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/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/logcategory.h" +#include "blackmisc/logcategories.h" #include "blackmisc/statusmessage.h" #include "blackmisc/mixin/mixincompare.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/simulation/autopublishdata.cpp b/src/blackmisc/simulation/autopublishdata.cpp index 454bf832f..abac59474 100644 --- a/src/blackmisc/simulation/autopublishdata.cpp +++ b/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 #include diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index 6854db319..5ef9da46e 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/simulation/distributor.h" #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.h b/src/blackmisc/simulation/fscommon/fscommonutil.h index 3e7eed527..2e2a05243 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.h +++ b/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 diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h index b1dd73939..9cf8195d7 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/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 #include diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index 4b5b8ff18..6c83f2bcd 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/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 diff --git a/src/blackmisc/simulation/xplane/xplaneutil.h b/src/blackmisc/simulation/xplane/xplaneutil.h index e801fc0b0..b67dd03bb 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.h +++ b/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 diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index c29a68ca9..f13b6db22 100644 --- a/src/blackmisc/valuecache.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h index 0438fb847..037fab535 100644 --- a/src/blackmisc/worker.h +++ b/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" diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index 1a0ae23dd..72bc11090 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h +++ b/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 diff --git a/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp b/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp index c98cd0183..d00b77153 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp +++ b/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 #include #include diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 70b166fb2..55828f0cf 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/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 #include diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index ff5addf15..e088afd6d 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/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/logcategorylist.h" +#include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/threadutils.h" #include "blackconfig/buildconfig.h"