Merge feature/lts-viewer-validation-testing-phase into feature/qt6-migration-basis-modules-merge

Resolves 1 conflict (new_docker_build.sh, union of viewer-only + codification options); folds in fixes for pre-existing defects surfaced by the validation runs (KDReports-qt6 wiring, LtsSession RTI linking, LtsFileDialog/WLS/BSM Qt6/RTI API migration, GROUP4 target list, new --cmake_build_flags option); validated with BUILD_RTI=ON BUILD_GRANTLEE=ON in 3 Docker runs (run 3: build green, 6 base-state first-run CTest failures documented).

qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog_widget.cpp

@@ -114,8 +114,8 @@ bool LtsFileDialogWidget::init(LtsSession::LtsSession *session,
   // initial all valid, not-deleted files
   auto predicate = [](const FileManagement::FileContent &fc, const QString &xmlType)
   {
-    return (!fc.isDeleted() && fc.fileStatus() == FileManagement::FileStatus::Valid &&
-           (xmlType.isEmpty() || fc.properties().find(xmlType.toStdString()) != std::string::npos));
+    return (!fc.isDeleted && fc.fileStatus == FileManagement::FileStatus::Valid &&
+           (xmlType.isEmpty() || fc.properties.find(xmlType.toStdString()) != std::string::npos));
   };
   m_modelFile->initModel(m_dtc, m_opmDtc, xmlType, predicate);
 
@@ -200,7 +200,7 @@ void LtsFileDialogWidget::onFolderSelectionChanged(const QItemSelection& /*selec
 //-----------------------------------------------------------------------------------------------------------
 void LtsFileDialogWidget::requestReadingSelectedFile()
 {
-  emit readSelectedFile(m_selectedFileContent.id());
+  emit readSelectedFile(m_selectedFileContent.id);
 }
 
 //-----------------------------------------------------------------------------------------------------------
@@ -228,7 +228,7 @@ void LtsFileDialogWidget::onChooseFileName()
 }
 
 //----------------------------------------------------------------------------
-void LtsFileDialogWidget::onFolderChanged(const FileManagement::Folder &data, FileManagement::Interface::DataModification modType)
+void LtsFileDialogWidget::onFolderChanged(const FileManagement::Folder &data, DataModification modType)
 {
   Q_UNUSED(data);
   Q_UNUSED(modType);
@@ -240,7 +240,7 @@ void LtsFileDialogWidget::onFolderChanged(const FileManagement::Folder &data, Fi
 }
 
 //----------------------------------------------------------------------------
-void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data, FileManagement::Interface::DataModification modType)
+void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data, DataModification modType)
 {
   bool condition = showFile(data, m_xmlType);
 
@@ -250,17 +250,17 @@ void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data,
   if (selIndex.isValid())
     row = selIndex.row();
 
-  if (modType == FileManagement::Interface::DataModification::eRemoved)
+  if (modType == DataModification::eRemoved)
   {
     m_modelFile->removeRow(row);
     return;
   }
-  if (modType == FileManagement::Interface::DataModification::eAdded && condition)
+  if (modType == DataModification::eAdded && condition)
   {
     m_modelFile->insertRow(data);
     return;
   }
-  if (modType == FileManagement::Interface::DataModification::eModified && condition)
+  if (modType == DataModification::eModified && condition)
   {
     m_modelFile->setRowData(row, data);
     return;
@@ -301,7 +301,7 @@ void LtsFileDialogWidget::enaDisa()
   {
     QString folderName = m_modelFolder->getFolderName(m_modelFolder->getFolder(idxFolder));
     m_ui->lblSelectedFolder->setText(folderName);
-    m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id();
+    m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id;
   }
   else
   {
@@ -314,7 +314,7 @@ void LtsFileDialogWidget::enaDisa()
   if (idxFile.isValid())
   {
     m_selectedFileContent = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
-    m_fileName = m_selectedFileContent.name();
+    m_fileName = QString::fromStdString(m_selectedFileContent.name);
     m_ui->leFile->setText(m_fileName);
   }
   else
@@ -333,31 +333,31 @@ void LtsFileDialogWidget::enaDisa()
 //--------------------------------------------------------------------------
 bool LtsFileDialogWidget::showFile(const FileManagement::FileContent &fc, const QString &xmlType)
 {
-  if (fc.isDeleted())
+  if (fc.isDeleted)
     return false;
 
-  if (fc.folderId() != m_selectedFolderId)
+  if (fc.folderId != m_selectedFolderId)
     return false;
 
-  if (!m_fileTypes.isEmpty() && !m_fileTypes.contains(fc.fileType()))
+  if (!m_fileTypes.isEmpty() && !m_fileTypes.contains(fc.fileType))
     return false;
 
-  if (fc.fileStatus() != FileManagement::FileStatus::Valid)
+  if (fc.fileStatus != FileManagement::FileStatus::Valid)
     return false;
 
   // get folder selected
   const QModelIndex selIndex = selectedIndexViewFolder();
   const NGLTreeItem *item = m_modelFolder->privateData(selIndex);
   const FileManagement::Folder fld = item->data().value<FileManagement::Folder>();
-  const auto &fldPath = fld.path();
+  const auto &fldPath = fld.path;
 
   // filter in USER DOCUMENTS folder and subfolders
   if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
   {
     const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     // filter on User Category and OperatorId
-    if (fc.fileCategory() == FileManagement::FileCategory::User &&
-        fc.operatorId() != operatorId)
+    if (fc.fileCategory == FileManagement::FileCategory::User &&
+        fc.operatorId != operatorId)
       return false;
   }
 
@@ -365,20 +365,20 @@ bool LtsFileDialogWidget::showFile(const FileManagement::FileContent &fc, const
   if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
   {
     // filter on Category = Exercise
-    if (fc.fileCategory() != FileManagement::FileCategory::Exercise)
+    if (fc.fileCategory != FileManagement::FileCategory::Exercise)
       return false;
     if (m_session->exerciseId() > 0)
     {
-      // filter on exact exerciseId
-      if (fc.exerciseId() != m_session->exerciseId())
+      // filter on exact exerciseId (optional member, no comparison operator)
+      if (!fc.exerciseId.has_value() || fc.exerciseId.value() != m_session->exerciseId())
         return false;
     }
   }
 
   // filter on XmlType
-  if (fc.fileType() == FileManagement::FileType::Xml && !xmlType.isEmpty() && fc.properties().size() > 0)
+  if (fc.fileType == FileManagement::FileType::Xml && !xmlType.isEmpty() && fc.properties.size() > 0)
   {
-    const QString &prop = QString::fromStdString(fc.properties());
+    const QString &prop = QString::fromStdString(fc.properties);
     if (!prop.contains(xmlType, Qt::CaseSensitive))
     {
       return false;