fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+8
-9
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_effect_cluster.h"
|
||||
#include <utility>
|
||||
#include "handler_charge_administration.h"
|
||||
#include "object_effect_cluster.h"
|
||||
#include "settings.h"
|
||||
@@ -390,8 +391,6 @@ void HandlerEffectCluster::onEffectClusterOcModifyRequest(const rti::core::Sampl
|
||||
ecCommonModifyRequest.area = request.area;
|
||||
|
||||
int impactCount = 0;
|
||||
for (const auto &effector : request.effectors)
|
||||
effector.chargeAmount;
|
||||
if (impactCount == 1)
|
||||
ecCommonModifyRequest.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint;
|
||||
else
|
||||
@@ -632,7 +631,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
|
||||
void HandlerEffectCluster::recountActiveAreas()
|
||||
{
|
||||
s_currentAirSupportCount = 0;
|
||||
for (const auto *area : qAsConst(m_objectMap))
|
||||
for (const auto *area : std::as_const(m_objectMap))
|
||||
{
|
||||
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
|
||||
{
|
||||
@@ -681,7 +680,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
|
||||
QMap<int, ObjectEffectCluster *> effectClusterPartyMap;
|
||||
|
||||
for (const auto *area : qAsConst(m_objectMap))
|
||||
for (const auto *area : std::as_const(m_objectMap))
|
||||
{
|
||||
if (area->data().partyId == request.partyId)
|
||||
{
|
||||
@@ -701,7 +700,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A: // Feuer Halt Allgemein
|
||||
{
|
||||
// all control operations are halted
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
{
|
||||
EffectClusterPauseResumeRequest req;
|
||||
|
||||
@@ -718,7 +717,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
{
|
||||
// Ongoing combat operations are halted after comparing the extent of
|
||||
// the fire hold with the corresponding target coordinate and circular area.
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
{
|
||||
const double lonRad = request.longitude.is_set() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0;
|
||||
const double latRad = request.latitude.is_set() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0;
|
||||
@@ -746,7 +745,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
// Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired,
|
||||
// followed by an EX-FQ(FN) report. Once the weapon system confirms execution,
|
||||
// the engagement is closed and the target area status is set to "expired."
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "[Feuer Einstellen ----- markAsExpired] " << "effectClusterId: " << ifs->data().id;
|
||||
|
||||
@@ -755,7 +754,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
break;
|
||||
}
|
||||
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C: // Aufheben Feuer Halt Allgemein
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id;
|
||||
|
||||
@@ -768,7 +767,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
|
||||
break;
|
||||
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F: // Aufheben Feuer Halt Referenziert
|
||||
{
|
||||
for (auto *ifs : qAsConst(effectClusterPartyMap))
|
||||
for (auto *ifs : std::as_const(effectClusterPartyMap))
|
||||
{
|
||||
const double lonRad = request.longitude.is_set() ? request.longitude.get() * LtsCoordTrans::deg2rad() : 0.0; // optional<lonRad>
|
||||
const double latRad = request.latitude.is_set() ? request.latitude.get() * LtsCoordTrans::deg2rad() : 0.0; // optional <latRad>
|
||||
|
||||
Reference in new issue
Block a user