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_dialog_model_file.cpp

@@ -53,14 +53,13 @@ bool DialogModelFile::initModel(const std::shared_ptr<FileManagement::Interface:
   clear();
 
   // insert Model
-  auto files = [this, xmlType, predicate](const std::vector<FileManagement::FileContent> & fcs, const std::vector<int> &, FileManagement::Interface::DataModification)
+  // Dtc per-item callback: return true to stop iteration (iterateUntil), so collect with false.
+  // Explicit std::function type disambiguates the void/bool overloads.
+  std::function<bool(const FileManagement::FileContent &)> files = [this, xmlType, predicate](const FileManagement::FileContent &fc)
   {
-    for (const auto& fc : fcs)
-    {
-      if (!predicate(fc, xmlType))
-        continue;
+    if (predicate(fc, xmlType))
       insertRow(fc);
-    }
+    return false;
   };
   m_flmDtc->fileContents(files);
 
@@ -79,7 +78,7 @@ QVariant DialogModelFile::data(const QModelIndex &index, int role) const
   {
   case Qt::BackgroundRole:
   {
-    if (fl.fileStatus() == FileManagement::FileStatus::Deleted)
+    if (fl.fileStatus == FileManagement::FileStatus::Deleted)
       return QGuiApplication::palette().color(QPalette::Disabled, QPalette::AlternateBase);
     return QGuiApplication::palette().color(QPalette::Active, QPalette::Base);
   }
@@ -88,38 +87,38 @@ QVariant DialogModelFile::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case NAME:
-      return fl.name();
+      return QString::fromStdString(fl.name);
     case ISTEMPLATE:
-      return fl.isTemplate() ? tr("Yes") : tr("No");
+      return fl.isTemplate ? tr("Yes") : tr("No");
     case FOLDER:
-      return fl.folderId();
+      return fl.folderId;
     case FILETYPE:
-      return FileManagement::toString(fl.fileType());
+      return FileManagement::toString(fl.fileType);
     case FILECATEGORY:
-      return FileManagement::toString(fl.fileCategory());
+      return FileManagement::toString(fl.fileCategory);
     case FILESTATUS:
-      return FileManagement::toString(fl.fileStatus());
+      return FileManagement::toString(fl.fileStatus);
     case OPERATOR:
-      return QString::fromStdString(m_opmDtc->user(fl.operatorId()).name());
+      return QString::fromStdString(m_opmDtc->user(fl.operatorId).name);
     case EXERCISE:
-      return fl.exerciseId().has_value() ? fl.exerciseId().value() : QVariant();
+      return fl.exerciseId.has_value() ? fl.exerciseId.value() : QVariant();
     case PHASE:
-      return fl.phaseId().has_value() ? fl.phaseId().value() : QVariant();
+      return fl.phaseId.has_value() ? fl.phaseId.value() : QVariant();
     case USEDBY:
-      return fl.isUsedBy() ? tr("Yes") : tr("No");
+      return fl.isUsedBy ? tr("Yes") : tr("No");
     case USES:
-      return QString::fromStdString(fl.usedBy());
+      return QString::number(fl.usedBy);
     case LASTMODIFIED:
-      return DTG::toStringMSec(fl.lastModified().toMSecsSinceEpoch());
+      return DTG::toStringMSec(fl.lastModified);
     case PROPERTIES:
-      return QString::fromStdString(fl.properties());
+      return QString::fromStdString(fl.properties);
     default:
       break;
     }
   }
   case Qt::DecorationRole:
   {
-    if (index.column() == NAME && fl.isHidden())
+    if (index.column() == NAME && fl.isHidden)
       return QIcon(QLatin1String(":/style/lock.svg"));
     break;
   }
@@ -136,9 +135,9 @@ int DialogModelFile::findFileIdFromName(const QString &fileName) const
   for (int row = 0; row < rc; ++row)
   {
     const FileManagement::FileContent &fl = this->getRowData(row);
-    if (fl.name() == fileName)
+    if (fl.name == fileName)
     {
-      return fl.id();
+      return fl.id;
     }
   }
   return 0;
@@ -158,7 +157,7 @@ QMimeData * DialogModelFile::mimeData(const QModelIndexList &indexes) const
 
   const QModelIndex                 & index = indexes.first();
   const FileManagement::FileContent & fl    = this->getRowData(index.row());
-  int                                 id    = fl.id();
+  int                                 id    = fl.id;
 
   if (id <= 0) return nullptr;
 
@@ -188,7 +187,7 @@ bool DialogFileProxyModel::lessThan(const QModelIndex &source_left, const QModel
   switch (source_left.column())
   {
   case LASTMODIFIED:
-    return dataLeft.lastModified() < dataRight.lastModified();
+    return dataLeft.lastModified < dataRight.lastModified;
   case NAME:
   case ISTEMPLATE:
   case FILETYPE: