fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+6
-5
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "object_mine_area_null.h"
|
||||
#include <utility>
|
||||
#include "special_area_provider.h"
|
||||
|
||||
#include <QtGui/QPolygonF>
|
||||
@@ -73,7 +74,7 @@ bool ObjectMineAreaNull::isVirtualMine() const
|
||||
int ObjectMineAreaNull::lastConcreteMineNo()
|
||||
{
|
||||
int lastMineNo = 0;
|
||||
for (const Database::AesMineAreaTriggeredMines &mine : qAsConst(m_triggeredMines))
|
||||
for (const Database::AesMineAreaTriggeredMines &mine : std::as_const(m_triggeredMines))
|
||||
{
|
||||
// NOTE: igniterType/IgniterFunciton = 0 as long as AesMineAreaTriggeredMines does not contain values
|
||||
DEBUG_LOG(m_logger) << "mine: chargeTypeId " << mine.chargeTypeId << ", mineId: " << mine.mineId;
|
||||
@@ -245,7 +246,7 @@ void ObjectMineAreaNull::publishAiv()
|
||||
vec.reserve(m_triggeredMines.size());
|
||||
QPolygonF tmp;
|
||||
tmp.reserve(m_triggeredMines.size());
|
||||
for (const auto &mine : qAsConst(m_triggeredMines))
|
||||
for (const auto &mine : std::as_const(m_triggeredMines))
|
||||
{
|
||||
vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0));
|
||||
tmp.push_back(mine.position);
|
||||
@@ -285,7 +286,7 @@ bool ObjectMineAreaNull::publishTriggeredImpacts()
|
||||
tis.setId = dds::core::optional<rti::core::int64>(m_setId);
|
||||
|
||||
int i = 0;
|
||||
for (const auto &mine : qAsConst(m_triggeredMines))
|
||||
for (const auto &mine : std::as_const(m_triggeredMines))
|
||||
{
|
||||
// Triggered Impact == 0, if mine is disarmed/exploded
|
||||
LtsUtils::BitArray::setBit(tis.bitfield, i++, !mine.isTriggered);
|
||||
@@ -307,7 +308,7 @@ bool ObjectMineAreaNull::publishDusMineStatus()
|
||||
dms.mines.resize(m_triggeredMines.size());
|
||||
dms.setId = dds::core::optional<rti::core::int64>(m_setId);
|
||||
int i = 0;
|
||||
for (const auto &mine : qAsConst(m_triggeredMines))
|
||||
for (const auto &mine : std::as_const(m_triggeredMines))
|
||||
{
|
||||
const DusMine entry(mine.mineId, mine.isTriggered, mine.chargeTypeId, {mine.position.x(), mine.position.y()});
|
||||
dms.mines[i++] = entry;
|
||||
@@ -328,7 +329,7 @@ QPolygonF ObjectMineAreaNull::generateForm()
|
||||
vec.reserve(m_triggeredMines.size());
|
||||
QPolygonF tmp;
|
||||
tmp.reserve(m_triggeredMines.size());
|
||||
for (const auto &mine : qAsConst(m_triggeredMines))
|
||||
for (const auto &mine : std::as_const(m_triggeredMines))
|
||||
{
|
||||
vec.emplace_back(Core::GeoPosition(mine.position.x(), mine.position.y(), 0));
|
||||
tmp.push_back(mine.position);
|
||||
|
||||
Reference in new issue
Block a user