Skip to content

Commit 63e8de8

Browse files
committed
Issue #77 getLogCategories returns a simple QStringList instead of our own class
1 parent 05d2801 commit 63e8de8

File tree

156 files changed

+862
-833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+862
-833
lines changed

src/blackcore/afv/audio/receiversampleprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ namespace BlackCore
2828
{
2929
namespace Audio
3030
{
31-
const CLogCategoryList &CReceiverSampleProvider::getLogCategories()
31+
const QStringList &CReceiverSampleProvider::getLogCategories()
3232
{
33-
static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() };
33+
static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() };
3434
return cats;
3535
}
3636

src/blackcore/afv/audio/receiversampleprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace BlackCore
4343

4444
public:
4545
//! Log.categories
46-
static const BlackMisc::CLogCategoryList &getLogCategories();
46+
static const QStringList &getLogCategories();
4747

4848
//! Ctor
4949
CReceiverSampleProvider(const QAudioFormat &audioFormat, quint16 id, int voiceInputNumber, QObject *parent = nullptr);

src/blackcore/afv/clients/afvclient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ namespace BlackCore
4949
constexpr double CAfvClient::MaxDbOut;
5050
constexpr quint32 CAfvClient::UniCom;
5151

52-
const CLogCategoryList &CAfvClient::getLogCategories()
52+
const QStringList &CAfvClient::getLogCategories()
5353
{
54-
static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() };
54+
static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() };
5555
return cats;
5656
}
5757

src/blackcore/afv/clients/afvclient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace BlackCore
6060

6161
public:
6262
//! Categories
63-
static const BlackMisc::CLogCategoryList &getLogCategories();
63+
static const QStringList &getLogCategories();
6464

6565
//! Connection status
6666
enum ConnectionStatus { Disconnected, Connected };

src/blackcore/afv/connection/apiserverconnection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ namespace BlackCore
3232
{
3333
namespace Connection
3434
{
35-
const CLogCategoryList &CApiServerConnection::getLogCategories()
35+
const QStringList &CApiServerConnection::getLogCategories()
3636
{
37-
static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() };
37+
static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() };
3838
return cats;
3939
}
4040

src/blackcore/afv/connection/apiserverconnection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace BlackCore
5050
};
5151

5252
//! Categories
53-
static const BlackMisc::CLogCategoryList &getLogCategories();
53+
static const QStringList &getLogCategories();
5454

5555
//! Constructor
5656
CApiServerConnection(const QString &address, QObject *parent = nullptr);

src/blackcore/afv/connection/clientconnectiondata.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ namespace BlackCore
1919
{
2020
namespace Connection
2121
{
22-
const CLogCategoryList &CClientConnectionData::getLogCategories()
22+
const QStringList &CClientConnectionData::getLogCategories()
2323
{
24-
static const CLogCategoryList cats { CLogCategory::audio(), CLogCategory::vatsimSpecific() };
24+
static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() };
2525
return cats;
2626
}
2727

src/blackcore/afv/connection/clientconnectiondata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace BlackCore
3232
{
3333
public:
3434
//! Categories
35-
static const BlackMisc::CLogCategoryList &getLogCategories();
35+
static const QStringList &getLogCategories();
3636

3737
//! Ctor
3838
CClientConnectionData() = default;

src/blackcore/aircraftmatcher.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ using namespace BlackMisc::Simulation;
4040

4141
namespace BlackCore
4242
{
43-
const CLogCategoryList &CAircraftMatcher::getLogCategories()
43+
const QStringList &CAircraftMatcher::getLogCategories()
4444
{
45-
static const CLogCategoryList cats { CLogCategory::matching() };
45+
static const QStringList cats { CLogCategories::matching() };
4646
return cats;
4747
}
4848

@@ -594,7 +594,7 @@ namespace BlackCore
594594
if (ms.isError())
595595
{
596596
const QString msg = QStringLiteral("Matching script error: %1 '%2'").arg(ms.property("lineNumber").toInt()).arg(ms.toString());
597-
CLogMessage(getLogCategories()).warning(msg);
597+
CLogMessage(static_cast<CAircraftMatcher *>(nullptr)).warning(msg);
598598
if (log) { CLogUtilities::addLogDetailsToList(log, callsign, msg); }
599599
}
600600
else

src/blackcore/aircraftmatcher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace BlackCore
5252

5353
public:
5454
//! Log categories
55-
static const BlackMisc::CLogCategoryList &getLogCategories();
55+
static const QStringList &getLogCategories();
5656

5757
//! Constructor
5858
CAircraftMatcher(const BlackMisc::Simulation::CAircraftMatcherSetup &setup, QObject *parent = nullptr);

0 commit comments

Comments
 (0)