Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+5
-4
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include <utility>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include "main_handler.h"
|
||||
#include "ParticipantHandling/participant.h"
|
||||
@@ -90,7 +91,7 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
|
||||
<<" Items size = "<<missionItemVec.size()
|
||||
<<" Actions size = "<<missionActionVec.size();
|
||||
// add to internal buffer
|
||||
for (const ParticipantManagement::Database::PpmMissionPlan &data : qAsConst(missionPlanVec))
|
||||
for (const ParticipantManagement::Database::PpmMissionPlan &data : std::as_const(missionPlanVec))
|
||||
{
|
||||
ParticipantManagement::MissionPlan missionPlan;
|
||||
missionPlan.id(data.id);
|
||||
@@ -105,12 +106,12 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
|
||||
QMultiMap <int, ParticipantManagement::Database::PpmMissionAction> actionsDbMap;
|
||||
//get mission items and actions for curr mission plan id
|
||||
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &itemDb : qAsConst(missionItemVec))
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &itemDb : std::as_const(missionItemVec))
|
||||
{
|
||||
if (itemDb.missionPlanId == data.id)
|
||||
{
|
||||
itemsDbMap.insert(itemDb.elementNumber, itemDb);
|
||||
for (const ParticipantManagement::Database::PpmMissionAction &actionDb : qAsConst(missionActionVec) )
|
||||
for (const ParticipantManagement::Database::PpmMissionAction &actionDb : std::as_const(missionActionVec) )
|
||||
{
|
||||
if (actionDb.missionItemId == itemDb.id)
|
||||
actionsDbMap.insert(actionDb.missionItemId, actionDb);
|
||||
@@ -120,7 +121,7 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
|
||||
|
||||
|
||||
missionPlan.items().reserve(itemsDbMap.size());
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : qAsConst(itemsDbMap))
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(itemsDbMap))
|
||||
{
|
||||
ParticipantManagement::MissionItem msi;
|
||||
msi.actions().reserve(actionsDbMap.size());
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "object_mission_plan.h"
|
||||
#include <utility>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
@@ -78,7 +79,7 @@ void ObjectMissionPlan::setDbMissionItems(const QMap<int, ParticipantManagement:
|
||||
m_mapMissionItems.clear();
|
||||
m_dbMissionActions.clear();
|
||||
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : qAsConst(dbItems))
|
||||
for (const ParticipantManagement::Database::PpmMissionItem &item : std::as_const(dbItems))
|
||||
{
|
||||
ParticipantManagement::MissionItem msi;
|
||||
msi.actions().reserve(dbActions.size());
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include "uas_handler.h"
|
||||
#include <utility>
|
||||
#include "uas.h"
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include "main_handler.h"
|
||||
@@ -53,7 +54,7 @@ bool UasHandler::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const Database::PpmUas ¤tUas : qAsConst(uasVec))
|
||||
for (const Database::PpmUas ¤tUas : std::as_const(uasVec))
|
||||
{
|
||||
UasHandling::Uas *newUas = new UasHandling::Uas(currentUas);
|
||||
|
||||
@@ -283,7 +284,7 @@ void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnect
|
||||
|
||||
bool UasHandler::hostNameHostPortExists(const QString &hostname, int hostport, int uasId)
|
||||
{
|
||||
for (Uas *uas : qAsConst(m_uass))
|
||||
for (Uas *uas : std::as_const(m_uass))
|
||||
{
|
||||
if (uas->id() == uasId)
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user