flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 18:25:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename verify macros

Browse Source
This commit is contained in:
Lars Toenning
2024-11-10 13:10:41 +01:00
parent 0db0c16668
commit 9c879aea1c
74 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -647,7 +647,7 @@ namespace BlackSimPlugin::Flightgear
if (!hasCallsign)
{
// does not make sense to continue here
BLACK_VERIFY_X(false, Q_FUNC_INFO, "missing callsign");
SWIFT_VERIFY_X(false, Q_FUNC_INFO, "missing callsign");
continue;
}
@@ -702,7 +702,7 @@ namespace BlackSimPlugin::Flightgear
{
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(planesPositions.hasSameSizes(), Q_FUNC_INFO, "Mismatching sizes");
SWIFT_VERIFY_X(planesPositions.hasSameSizes(), Q_FUNC_INFO, "Mismatching sizes");
}
m_trafficProxy->setPlanesPositions(planesPositions);
}
@@ -770,12 +770,12 @@ namespace BlackSimPlugin::Flightgear
for (int i = 0; i < size; i++)
{
const bool emptyCs = callsigns[i].isEmpty();
BLACK_VERIFY_X(!emptyCs, Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(!emptyCs, Q_FUNC_INFO, "Need callsign");
if (emptyCs) { continue; }
const CCallsign cs(callsigns[i]);
if (!m_flightgearAircraftObjects.contains(cs)) { continue; }
const CFlightgearMPAircraft fgAircraft = m_flightgearAircraftObjects[cs];
BLACK_VERIFY_X(fgAircraft.hasCallsign(), Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(fgAircraft.hasCallsign(), Q_FUNC_INFO, "Need callsign");
if (!fgAircraft.hasCallsign()) { continue; }
CElevationPlane elevation = CElevationPlane::null();
@@ -815,7 +815,7 @@ namespace BlackSimPlugin::Flightgear
void CSimulatorFlightgear::onRemoteAircraftAdded(const QString &callsign)
{
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign);
CSimulatedAircraft addedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);
@@ -891,7 +891,7 @@ namespace BlackSimPlugin::Flightgear
void CSimulatorFlightgear::onRemoteAircraftAddingFailed(const QString &callsign)
{
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign);
CSimulatedAircraft failedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);

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

@@ -1070,7 +1070,7 @@ namespace BlackSimPlugin::FsxCommon
simObjAddAgain.increaseAddingExceptions();
if (!simObject.hasCallsign())
{
BLACK_VERIFY_X(false, Q_FUNC_INFO, "Missing callsign");
SWIFT_VERIFY_X(false, Q_FUNC_INFO, "Missing callsign");
return;
}
@@ -1200,7 +1200,7 @@ namespace BlackSimPlugin::FsxCommon
for (const CSimConnectObject &pendingSimObj : std::as_const(m_addPendingAircraft))
{
BLACK_VERIFY_X(pendingSimObj.hasCallsign(), Q_FUNC_INFO, "missing callsign");
SWIFT_VERIFY_X(pendingSimObj.hasCallsign(), Q_FUNC_INFO, "missing callsign");
if (!pendingSimObj.hasCallsign()) { continue; }
if (pendingSimObj.isTerrainProbe() || aircraftCallsignsInRange.contains(pendingSimObj.getCallsign()))
{
@@ -1568,7 +1568,7 @@ namespace BlackSimPlugin::FsxCommon
canAdd = situation.isPositionOrAltitudeNull();
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(canAdd, Q_FUNC_INFO, "Expect valid situation");
SWIFT_VERIFY_X(canAdd, Q_FUNC_INFO, "Expect valid situation");
CLogMessage(this).warning(u"Invalid situation for '%1'") << callsign;
}
}
@@ -1942,8 +1942,8 @@ namespace BlackSimPlugin::FsxCommon
const CCallsign callsign(simObject.getCallsign());
const bool hasCs = !callsign.isEmpty();
const bool hasValidIds = simObject.hasValidRequestAndObjectId();
BLACK_VERIFY_X(hasCs, Q_FUNC_INFO, "missing callsign");
BLACK_AUDIT_X(hasValidIds, Q_FUNC_INFO, "Missing ids");
SWIFT_VERIFY_X(hasCs, Q_FUNC_INFO, "missing callsign");
SWIFT_AUDIT_X(hasValidIds, Q_FUNC_INFO, "Missing ids");
if (!hasCs || !hasValidIds) { continue; } // not supposed to happen
const DWORD objectId = simObject.getObjectId();
@@ -2260,7 +2260,7 @@ namespace BlackSimPlugin::FsxCommon
// crosscheck
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(isValidFsxPosition(position), Q_FUNC_INFO, "Invalid FSX pos.");
SWIFT_VERIFY_X(isValidFsxPosition(position), Q_FUNC_INFO, "Invalid FSX pos.");
}
return position;

12
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -928,7 +928,7 @@ namespace BlackSimPlugin::XPlane
if (!hasCallsign)
{
// does not make sense to continue here
BLACK_VERIFY_X(false, Q_FUNC_INFO, "missing callsign");
SWIFT_VERIFY_X(false, Q_FUNC_INFO, "missing callsign");
continue;
}
@@ -989,7 +989,7 @@ namespace BlackSimPlugin::XPlane
{
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(planesPositions.hasSameSizes(), Q_FUNC_INFO, "Mismatching sizes");
SWIFT_VERIFY_X(planesPositions.hasSameSizes(), Q_FUNC_INFO, "Mismatching sizes");
}
m_trafficProxy->setPlanesPositions(planesPositions);
}
@@ -1059,13 +1059,13 @@ namespace BlackSimPlugin::XPlane
for (int i = 0; i < size; i++)
{
const bool emptyCs = callsigns[i].isEmpty();
BLACK_VERIFY_X(!emptyCs, Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(!emptyCs, Q_FUNC_INFO, "Need callsign");
if (emptyCs) { continue; }
const CCallsign cs(callsigns[i]);
if (!m_xplaneAircraftObjects.contains(cs)) { continue; }
const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs];
BLACK_VERIFY_X(xpAircraft.hasCallsign(), Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(xpAircraft.hasCallsign(), Q_FUNC_INFO, "Need callsign");
if (!xpAircraft.hasCallsign()) { continue; }
CElevationPlane elevation = CElevationPlane::null();
@@ -1177,7 +1177,7 @@ namespace BlackSimPlugin::XPlane
void CSimulatorXPlane::onRemoteAircraftAdded(const QString &callsign)
{
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign);
CSimulatedAircraft addedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);
@@ -1223,7 +1223,7 @@ namespace BlackSimPlugin::XPlane
void CSimulatorXPlane::onRemoteAircraftAddingFailed(const QString &callsign)
{
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
SWIFT_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign);
CSimulatedAircraft failedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);