From d475246941abf18cd6f3056e3843dff665bf7714 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 13 Apr 2017 01:04:36 +0200
Subject: [PATCH] refs #935, add log. categories for vatlib

---
 src/blackcore/vatsim/networkvatlib.cpp | 17 ++++++++++++-----
 src/blackcore/vatsim/networkvatlib.h   |  7 +++++--
 src/blackcore/vatsim/voicevatlib.cpp   |  6 ++++++
 src/blackcore/vatsim/voicevatlib.h     |  4 +++-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index 91e2739c0..674271805 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -12,6 +12,8 @@
 #include "blackconfig/buildconfig.h"
 #include "blackcore/application.h"
 #include "blackcore/vatsim/networkvatlib.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/aviation/comsystem.h"
@@ -20,12 +22,9 @@
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/aviation/transponder.h"
-#include "blackmisc/compare.h"
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/geo/latitude.h"
 #include "blackmisc/geo/longitude.h"
-#include "blackmisc/json.h"
-#include "blackmisc/logmessage.h"
 #include "blackmisc/network/network.h"
 #include "blackmisc/network/textmessage.h"
 #include "blackmisc/network/user.h"
@@ -35,8 +34,10 @@
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/simulation/aircraftmodel.h"
-#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/json.h"
+#include "blackmisc/logmessage.h"
+#include "blackmisc/logcategory.h"
 #include "blackmisc/statusmessage.h"
 #include "vatlib/vatlib.h"
 
@@ -73,6 +74,12 @@ namespace BlackCore
 {
     namespace Vatsim
     {
+        const CLogCategoryList &CNetworkVatlib::getLogCategories()
+        {
+            static const CLogCategoryList cats({ CLogCategory::vatsimSpecific(), CLogCategory::network() });
+            return cats;
+        }
+
         CNetworkVatlib::CNetworkVatlib(IOwnAircraftProvider *ownAircraft, QObject *parent)
             : INetwork(parent), COwnAircraftAware(ownAircraft),
               m_loginMode(LoginNormal),
diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h
index ba46d455b..50f244116 100644
--- a/src/blackcore/vatsim/networkvatlib.h
+++ b/src/blackcore/vatsim/networkvatlib.h
@@ -16,6 +16,8 @@
 #include "blackcore/network.h"
 #include "blackcore/vatsim/vatsimsettings.h"
 #include "blackcore/tokenbucket.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/aviation/airlineicaocode.h"
@@ -25,8 +27,6 @@
 #include "blackmisc/network/server.h"
 #include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/settingscache.h"
-#include "blackmisc/simulation/ownaircraftprovider.h"
-#include "blackmisc/simulation/simulatorplugininfo.h"
 
 #include <stdbool.h>
 #include <vatlib/vatlib.h>
@@ -61,6 +61,9 @@ namespace BlackCore
             Q_OBJECT
 
         public:
+            //! Log. categories
+            static const BlackMisc::CLogCategoryList &getLogCategories();
+
             //! Constructor
             CNetworkVatlib(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, QObject *parent = nullptr);
 
diff --git a/src/blackcore/vatsim/voicevatlib.cpp b/src/blackcore/vatsim/voicevatlib.cpp
index 1e910fd60..1858db1b8 100644
--- a/src/blackcore/vatsim/voicevatlib.cpp
+++ b/src/blackcore/vatsim/voicevatlib.cpp
@@ -27,6 +27,12 @@ namespace BlackCore
 {
     namespace Vatsim
     {
+        const CLogCategoryList &CVoiceVatlib::getLogCategories()
+        {
+            static const CLogCategoryList cats({ CLogCategory::vatsimSpecific(), CLogCategory::network() });
+            return cats;
+        }
+
         CVoiceVatlib::CVoiceVatlib(QObject *parent) :
             IVoice(parent),
             m_audioService(Vat_CreateAudioService()),
diff --git a/src/blackcore/vatsim/voicevatlib.h b/src/blackcore/vatsim/voicevatlib.h
index e7576dad6..847f9fccb 100644
--- a/src/blackcore/vatsim/voicevatlib.h
+++ b/src/blackcore/vatsim/voicevatlib.h
@@ -15,7 +15,7 @@
 #include "blackcore/audiomixer.h"
 #include "blackcore/blackcoreexport.h"
 #include "blackcore/voice.h"
-
+#include "blackmisc/logcategorylist.h"
 #include <vatlib/vatlib.h>
 #include <QObject>
 #include <QScopedPointer>
@@ -48,6 +48,8 @@ namespace BlackCore
             Q_OBJECT
 
         public:
+            //! Log. categories
+            static const BlackMisc::CLogCategoryList &getLogCategories();
 
             //! Default constructor
             CVoiceVatlib(QObject *parent = nullptr);