Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

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

@@ -15,7 +15,8 @@
 #include <QPalette>
 #include <QMimeData>
 
-#include <Services/FileManagement/flm_translation.h>
+#include <FileManagement/flm_db.h>
+#include <FileManagement/flm_translation.h>
 
 using namespace LtsWidgets;
 //-------------------------------------------------------------------------------------
@@ -52,11 +53,14 @@ bool DialogModelFile::initModel(const std::shared_ptr<FileManagement::Interface:
   clear();
 
   // insert Model
-  auto files = [this, xmlType, predicate](const FileManagement::FileContent & fc)
+  auto files = [this, xmlType, predicate](const std::vector<FileManagement::FileContent> & fcs, const std::vector<int> &, FileManagement::Interface::DataModification)
   {
-    if (!predicate(fc, xmlType))
-      return;
-    insertRow(fc);
+    for (const auto& fc : fcs)
+    {
+      if (!predicate(fc, xmlType))
+        continue;
+      insertRow(fc);
+    }
   };
   m_flmDtc->fileContents(files);
 
@@ -66,10 +70,10 @@ bool DialogModelFile::initModel(const std::shared_ptr<FileManagement::Interface:
 //-------------------------------------------------------------------------------------
 QVariant DialogModelFile::data(const QModelIndex &index, int role) const
 {
-  if (!indexIsValid(index))
+  if (!this->indexIsValid(index))
     return {};
 
-  const FileManagement::FileContent &fl = getRowData(index.row());
+  const FileManagement::FileContent &fl = this->getRowData(index.row());
 
   switch(role)
   {
@@ -98,13 +102,13 @@ QVariant DialogModelFile::data(const QModelIndex &index, int role) const
     case OPERATOR:
       return QString::fromStdString(m_opmDtc->user(fl.operatorId()).name());
     case EXERCISE:
-      return fl.exerciseId().is_set() ? fl.exerciseId().get() : QVariant();
+      return fl.exerciseId().has_value() ? fl.exerciseId().value() : QVariant();
     case PHASE:
-      return fl.phaseId().is_set() ? fl.phaseId().get() : QVariant();
+      return fl.phaseId().has_value() ? fl.phaseId().value() : QVariant();
     case USEDBY:
       return fl.isUsedBy() ? tr("Yes") : tr("No");
     case USES:
-      return fl.usedBy();
+      return QString::fromStdString(fl.usedBy());
     case LASTMODIFIED:
       return DTG::toStringMSec(fl.lastModified());
     case PROPERTIES:
@@ -128,13 +132,13 @@ QVariant DialogModelFile::data(const QModelIndex &index, int role) const
 //-------------------------------------------------------------------------------------
 int DialogModelFile::findFileIdFromName(const QString &fileName) const
 {
-  const int rc = rowCount();
+  const int rc = this->rowCount();
   for (int row = 0; row < rc; ++row)
   {
-    const FileManagement::FileContent &fl = getRowData(row);
+    const FileManagement::FileContent &fl = this->getRowData(row);
     if (QString::fromStdString(fl.name()) == fileName)
     {
-      return fl.m_id();
+      return fl.id();
     }
   }
   return 0;
@@ -153,8 +157,8 @@ QMimeData * DialogModelFile::mimeData(const QModelIndexList &indexes) const
   if (indexes.size() > 1) return nullptr;
 
   const QModelIndex                 & index = indexes.first();
-  const FileManagement::FileContent & fl    = getRowData(index.row());
-  int                                 id    = fl.m_id();
+  const FileManagement::FileContent & fl    = this->getRowData(index.row());
+  int                                 id    = fl.id();
 
   if (id <= 0) return nullptr;
 
@@ -179,8 +183,8 @@ bool DialogFileProxyModel::lessThan(const QModelIndex &source_left, const QModel
       !source_left.isValid() ||
       !source_right.isValid())
     return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
-  const auto &dataLeft = m_sourceModel->m_vecData.at(source_left.row());
-  const auto dataRight = m_sourceModel->m_vecData.at(source_right.row());
+  const auto &dataLeft = m_sourceModel->getDataVector().at(source_left.row());
+  const auto dataRight = m_sourceModel->getDataVector().at(source_right.row());
   switch (source_left.column())
   {
   case LASTMODIFIED: