Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+10
-6
@@ -5,8 +5,12 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
FIND_PACKAGE(XercesC REQUIRED)
|
||||
FIND_PACKAGE(XSD REQUIRED)
|
||||
FIND_PACKAGE(XercesC)
|
||||
FIND_PACKAGE(XSD)
|
||||
IF (NOT XercesC_FOUND OR NOT XSD_FOUND)
|
||||
MESSAGE(WARNING "XercesC or XSD not found; skipping MSDL")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
|
||||
SET(zwmsmsdl_SRCS
|
||||
msdl_export.cpp
|
||||
@@ -78,9 +82,9 @@ NGL_TARGET_INCLUDE_DIRECTORIES(zwmsmsdl
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(zwmsmsdl
|
||||
PRIVATE
|
||||
Qt5::Gui
|
||||
Qt5::Xml
|
||||
Qt5::XmlPatterns
|
||||
Qt6::Gui
|
||||
Qt6::Xml
|
||||
Qt6::XmlPatterns
|
||||
XercesC::XercesC
|
||||
PUBLIC
|
||||
svcPpmCommon
|
||||
@@ -95,7 +99,7 @@ NGL_TARGET_LINK_LIBRARIES(zwmsmsdl
|
||||
ngltools
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
IF (WIN32)
|
||||
NGL_SET_TARGET_PROPERTIES(zwmsmsdl PROPERTIES UNITY_BUILD FALSE)
|
||||
|
||||
+3
-2
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include <xsd/MilitaryScenario_1.0.0.hxx>
|
||||
#include <utility>
|
||||
#include <xsd/MsdlComplexTypes_1.0.0.hxx>
|
||||
|
||||
#include "msdl_import.h"
|
||||
@@ -86,7 +87,7 @@ ImportMsdl::ImportMsdl(ParticipantManagement::ParticipantEditModel *pModel, cons
|
||||
|
||||
|
||||
|
||||
for (const ParticipantManagement::Type &type : qAsConst(m_mapTypes))
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
for (const auto &disId : type.disEntities())
|
||||
{
|
||||
@@ -723,7 +724,7 @@ void ImportMsdl::buildImportTreeView(QVector<MSDLParticipant> &vecUnitsWithValid
|
||||
bool ImportMsdl::applyDISMappingChangesToDatabase()
|
||||
{
|
||||
|
||||
for (int32_t typeId : qAsConst(m_setTouchedTypes))
|
||||
for (int32_t typeId : std::as_const(m_setTouchedTypes))
|
||||
{
|
||||
const ParticipantManagement::Type &touchedType = m_mapTypes.value(typeId);
|
||||
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "msdl_mapping_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_msdl_mapping_dialog.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
@@ -23,7 +24,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
|
||||
|
||||
|
||||
|
||||
for (const ParticipantManagement::Type &type : qAsConst(m_mapTypes))
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
|
||||
{
|
||||
@@ -69,7 +70,7 @@ void MappingDialog::slotClassTypeChanged()
|
||||
|
||||
int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt();
|
||||
|
||||
for (const ParticipantManagement::Type &type : qAsConst(m_mapTypes))
|
||||
for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
|
||||
{
|
||||
if (type.typeClass().underlying() != currentClass)
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user