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/logcategorylist.h"
+#include "blackmisc/logcategories.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/logcategorylist.h"
+#include "blackmisc/logcategories.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/logcategorylist.h"
+#include "blackmisc/logcategories.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/logcategory.h"
+#include "blackmisc/logcategories.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/logcategorylist.h"
+#include "blackmisc/logcategories.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/logcategorylist.h"
+#include "blackmisc/logcategories.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/restricted.h"
 #include "blackmisc/statusmessage.h"