fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+10
-9
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_mine_area.h"
|
||||
#include <utility>
|
||||
#include "Utils/polygons.h"
|
||||
#include "handler_effect_cluster.h"
|
||||
#include "handler_mine_corridor.h"
|
||||
@@ -69,7 +70,7 @@ bool HandlerMineArea::init()
|
||||
}
|
||||
|
||||
// create area mine objects
|
||||
for (const Database::AesMineArea &area : qAsConst(areaVec))
|
||||
for (const Database::AesMineArea &area : std::as_const(areaVec))
|
||||
{
|
||||
|
||||
if (area.layingProcedureTypeId == AesMaLayingProcedureType::LptArtillery && !area.isCentral
|
||||
@@ -159,7 +160,7 @@ void HandlerMineArea::redistributeMines(int aesId, QList<Database::AesMineAreaTr
|
||||
DEBUG_LOG(m_logger) << "Putting mines from " << aesId << " into other MineAreas if applicable or in NullArea.";
|
||||
|
||||
// check if any other MineArea will handle some of the mines
|
||||
for (const auto &mineArea : qAsConst(m_objectMap))
|
||||
for (const auto &mineArea : std::as_const(m_objectMap))
|
||||
{
|
||||
if (mineArea->id() != aesId)
|
||||
{
|
||||
@@ -185,7 +186,7 @@ void HandlerMineArea::redistributeMines(int aesId, QList<Database::AesMineAreaTr
|
||||
|
||||
bool HandlerMineArea::removeDuplicateMine(int mineId)
|
||||
{
|
||||
for (const auto &mineArea : qAsConst(m_objectMap))
|
||||
for (const auto &mineArea : std::as_const(m_objectMap))
|
||||
{
|
||||
if (mineArea->isDusMineArea() && mineArea->hasMine(mineId))
|
||||
{
|
||||
@@ -621,7 +622,7 @@ Core::FunctionReplyObject HandlerMineArea::mineResetRequest(const MineResetReque
|
||||
DEBUG_LOG(m_logger) << "Resetting all unassociated DUS mines (NullArea) and all DUS mine areas";
|
||||
// Do this first!
|
||||
m_nullArea->resetMines();
|
||||
for (auto mineAreaObj : qAsConst(m_objectMap))
|
||||
for (auto mineAreaObj : std::as_const(m_objectMap))
|
||||
{
|
||||
if (!mineAreaObj->isDusMineArea() && !mineAreaObj->isConcreteMine())
|
||||
continue;
|
||||
@@ -805,7 +806,7 @@ void HandlerMineArea::onNewMineCorridor(const AesItemView &aiv)
|
||||
if (aiv.effectStateId != AesEffectState::EsActivated)
|
||||
return;
|
||||
|
||||
for (ObjectMineArea *ma : qAsConst(m_objectMap))
|
||||
for (ObjectMineArea *ma : std::as_const(m_objectMap))
|
||||
{
|
||||
if (intersects(ma->boundingRect(), aiv.form))
|
||||
ma->clearCorridor(aiv);
|
||||
@@ -1183,7 +1184,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId)
|
||||
|
||||
std::vector<Core::GeoPosition2D> vec;
|
||||
vec.reserve(points.size());
|
||||
for (QPointF bbPoint : qAsConst(points))
|
||||
for (QPointF bbPoint : std::as_const(points))
|
||||
{
|
||||
Core::GeoPosition2D pos;
|
||||
pos.lon = bbPoint.x();
|
||||
@@ -1192,7 +1193,7 @@ void HandlerMineArea::onTimeoutEquipNo(int equipNo, int chargeTypeId)
|
||||
vec.push_back(pos);
|
||||
}
|
||||
// vec.reserve(boundingBox.size());
|
||||
// for( QPointF bbPoint : qAsConst(boundingBox))
|
||||
// for( QPointF bbPoint : std::as_const(boundingBox))
|
||||
// {
|
||||
// Core::GeoPosition2D pos;
|
||||
// LtsCoordTrans::UtmCoordinate utm;
|
||||
@@ -1259,7 +1260,7 @@ bool HandlerMineArea::checkIfNullMineIsInArea(const std::vector<AreaEffectSimula
|
||||
QVector<Database::AesMineAreaSegment> vecSeg;
|
||||
vecSeg.reserve(segments.size());
|
||||
|
||||
for (const AreaEffectSimulation::MineSegment &seg : qAsConst(segments))
|
||||
for (const AreaEffectSimulation::MineSegment &seg : std::as_const(segments))
|
||||
{
|
||||
Database::AesMineAreaSegment dbSeg;
|
||||
dbSeg.startPosition = QPointF(seg.positionStart.lon, seg.positionStart.lat);
|
||||
@@ -1303,7 +1304,7 @@ bool HandlerMineArea::containsPointInExpandedMinefield(const QPointF &positionGe
|
||||
mineAreaPolygonUtm.push_back(QPointF(pointMineAreaUtm.x, pointMineAreaUtm.y));
|
||||
}
|
||||
|
||||
for (const QPointF &mineAreaPointUTM : qAsConst(mineAreaPolygonUtm))
|
||||
for (const QPointF &mineAreaPointUTM : std::as_const(mineAreaPolygonUtm))
|
||||
{
|
||||
|
||||
double x = pointUtm.x - mineAreaPointUTM.x();
|
||||
|
||||
Reference in new issue
Block a user