flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 getLogCategories returns a simple QStringList instead of our own class

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-10-28 16:48:31 +00:00
parent 05d28017e7
commit 63e8de8f00
156 changed files with 862 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
View File

@@ -29,9 +29,9 @@ namespace BlackSimPlugin
{
namespace Emulated
{
const CLogCategoryList &CSimulatorEmulatedMonitorDialog::getLogCategories()
const QStringList &CSimulatorEmulatedMonitorDialog::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::driver(), CLogCategory::plugin() };
static const QStringList cats { CLogCategories::driver(), CLogCategories::plugin() };
return cats;
}

2
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
View File

@@ -37,7 +37,7 @@ namespace BlackSimPlugin
public:
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Ctor
explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr);

4
src/plugins/simulator/fs9/directplaypeer.cpp
View File

@@ -24,9 +24,9 @@ namespace BlackSimPlugin
{
namespace Fs9
{
const CLogCategoryList &CDirectPlayPeer::getLogCategories()
const QStringList &CDirectPlayPeer::getLogCategories()
{
static const BlackMisc::CLogCategoryList cats { CLogCategory::driver() };
static const QStringList cats { CLogCategories::driver() };
return cats;
}

2
src/plugins/simulator/fs9/directplaypeer.h
View File

@@ -49,7 +49,7 @@ namespace BlackSimPlugin
void setPlayerUserId(DPNID id) { m_playerUser = id; }
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();

2
src/plugins/simulator/fscommon/simulatorfscommon.cpp
View File

@@ -62,7 +62,7 @@ namespace BlackSimPlugin
{
const bool on = parser.toBool(2);
const bool s = this->useFsuipc(on);
CLogMessage(this, CLogCategory::cmdLine()).info(u"FSUIPC is '%1'") << boolToOnOff(s);
CLogMessage(this, CLogCategories::cmdLine()).info(u"FSUIPC is '%1'") << boolToOnOff(s);
return s;
}
return CSimulatorPluginCommon::parseDetails(parser);

12
src/plugins/simulator/fsxcommon/simconnectsymbols.cpp
View File

@@ -124,7 +124,7 @@ bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *fu
funcPtr = reinterpret_cast<FuncPtr>(library.resolve(funcName));
if (! funcPtr)
{
CLogMessage(CLogCategory::driver()).error(u"Failed to resolve %1: %2") << funcName << library.errorString();
CLogMessage(CLogCategories::driver()).error(u"Failed to resolve %1: %2") << funcName << library.errorString();
return false;
}
return true;
@@ -226,21 +226,21 @@ bool loadAndResolveP3DSimConnect(P3DSimConnectVersion version)
const bool resolvedP3DSimConnectSymbols = resolveP3DSimConnectSymbols(simConnectDll);
if (!resolvedCommon)
{
CLogMessage(CLogCategory::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'") << simConnectFileName;
CLogMessage(CLogCategories::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'") << simConnectFileName;
return false;
}
if (!resolvedP3DSimConnectSymbols)
{
CLogMessage(CLogCategory::driver()).error(u"Failed to resolve P3D symbols from SimConnect.dll: '%1'") << simConnectFileName;
CLogMessage(CLogCategories::driver()).error(u"Failed to resolve P3D symbols from SimConnect.dll: '%1'") << simConnectFileName;
return false;
}
CLogMessage(CLogCategory::driver()).info(u"Loaded and resolved P3D symbols from SimConnect.dll: '%1'") << simConnectFileName;
CLogMessage(CLogCategories::driver()).info(u"Loaded and resolved P3D symbols from SimConnect.dll: '%1'") << simConnectFileName;
return resolvedCommon && resolvedP3DSimConnectSymbols;
}
else
{
CLogMessage(CLogCategory::driver()).error(u"Failed to load SimConnect.dll: '%1' '%2'") << simConnectFileName << simConnectDll.errorString();
CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: '%1' '%2'") << simConnectFileName << simConnectDll.errorString();
return false;
}
}
@@ -304,7 +304,7 @@ bool loadAndResolveFsxSimConnect(bool manifestProbing)
}
else
{
CLogMessage(CLogCategory::driver()).error(u"Failed to load SimConnect.dll: %1") << simConnectDll.errorString();
CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: %1") << simConnectDll.errorString();
return false;
}
}

6
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -1375,7 +1375,7 @@ namespace BlackSimPlugin
{
const bool trace = parser.toBool(2);
this->setTraceSendId(trace);
CLogMessage(this, CLogCategory::cmdLine()).info(u"Tracing %1 driver sendIds is '%2'") << this->getSimulatorPluginInfo().getIdentifier() << boolToOnOff(trace);
CLogMessage(this, CLogCategories::cmdLine()).info(u"Tracing %1 driver sendIds is '%2'") << this->getSimulatorPluginInfo().getIdentifier() << boolToOnOff(trace);
return true;
}
@@ -1384,7 +1384,7 @@ namespace BlackSimPlugin
{
const bool on = parser.toBool(2);
this->setUsingSbOffsetValues(on);
CLogMessage(this, CLogCategory::cmdLine()).info(u"SB offsets is '%1'") << boolToOnOff(on);
CLogMessage(this, CLogCategories::cmdLine()).info(u"SB offsets is '%1'") << boolToOnOff(on);
return true;
}
@@ -1393,7 +1393,7 @@ namespace BlackSimPlugin
{
const bool on = parser.toBool(2);
m_logSbOffsets = on;
CLogMessage(this, CLogCategory::cmdLine()).info(u"SB log. offsets is '%1'") << boolToOnOff(on);
CLogMessage(this, CLogCategories::cmdLine()).info(u"SB log. offsets is '%1'") << boolToOnOff(on);
return true;
}

4
src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp
View File

@@ -24,9 +24,9 @@ namespace BlackSimPlugin
{
namespace XPlane
{
const CLogCategoryList &CXSwiftBusTrafficProxy::getLogCategories()
const QStringList &CXSwiftBusTrafficProxy::getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::driver(), CLogCategory::dbus() };
static const QStringList cats { CLogCategories::driver(), CLogCategories::dbus() };
return cats;
}

2
src/plugins/simulator/xplane/xswiftbustrafficproxy.h
View File

@@ -178,7 +178,7 @@ namespace BlackSimPlugin
}
//! Log. categories
static const BlackMisc::CLogCategoryList &getLogCategories();
static const QStringList &getLogCategories();
//! Constructor
CXSwiftBusTrafficProxy(QDBusConnection &connection, QObject *parent = nullptr, bool dummy = false);