Issue #77 Break cyclic dependency between CLogCategory and numerous classes

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