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

qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/CMakeLists.txt

@@ -43,6 +43,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsFileDialog
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsFileDialog
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_SOURCE_DIR}/include/FileManagement/
+    ${CMAKE_SOURCE_DIR}/include/OperatorManagement/
 )
 
 # Test-Executable
@@ -61,7 +63,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsFileDialogTest
     svcOpmClient
     svcExmClient
 #    RTI::nddscpp2
-    ddsconnector
+    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
   PUBLIC
     Qt6::Core
     Qt6::Widgets

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:

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

@@ -9,8 +9,9 @@
 
 #pragma once
 
-#include <Services/FileManagement/flm_dtc.h>
-#include <Services/OperatorManagement/opm_dtc.h>
+#include <FileManagement/flm_dtc.h>
+#include <FileManagement/flm_db.h>
+#include <OperatorManagement/opm_dtc.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>

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

@@ -68,13 +68,13 @@ QVariant DialogModelFolder::data(const QModelIndex &index, int role) const
       case NAME:
         return getFolderName(folderData);
       case ID:
-        return folderData.m_id();
+        return folderData.id();
       default:
         break;
       }
     }
     case Qt::UserRole:
-      return folderData.m_id();
+      return folderData.id();
     case Qt::DecorationRole:
     {
       if (folderData.isHidden())
@@ -111,9 +111,8 @@ QString DialogModelFolder::getFolderName(const FileManagement::Folder &folderDat
       int phId = folderName.remove(0,3).toInt();
       return QString::fromStdString(m_exmDtc->exercisePhase(phId).name());
     }
-    return FileManagement::trFolderName(folderName.toStdString());
   }
-  return FileManagement::trFolderName(folderName.toStdString());
+  return FileManagement::trFolderName(folderName);
 }
 
 //-----------------------------------------------------------------------------------------------------------
@@ -134,29 +133,34 @@ bool DialogModelFolder::initModel(int exerciseId, const QVector<FileManagement::
   QHash<int, QModelIndex> parentItemIndexCache;
   QVector<int> idsToExclude;
 
-  auto cbFolders = [exerciseId, &tmap, &idsToExclude, &mainFolders] (const FileManagement::Folder &data)
+  auto cbFolders = [this, exerciseId, &tmap, &idsToExclude, &mainFolders, &parentItemIndexCache] (const std::vector<FileManagement::Folder> &folders, const std::vector<int32_t> &ids, FileManagement::Interface::DataModification mod)
   {
-    if (data.isDeleted())
-      return;
-    if (exerciseId > 0)
+    Q_UNUSED(ids);
+    Q_UNUSED(mod);
+    for (const auto &data : folders)
     {
-      QString folderName = QString::fromStdString(data.name());
-      if (folderName.startsWith(QStringLiteral("$EX_")))
+      if (data.isDeleted())
+        continue;
+      if (exerciseId > 0)
       {
-        int exId = folderName.remove(0, 4).toInt();
-        if (exId != exerciseId)
-          idsToExclude.append(data.m_id());
+        QString folderName = QString::fromStdString(data.name());
+        if (folderName.startsWith(QStringLiteral("$EX_")))
+        {
+          int exId = folderName.remove(0, 4).toInt();
+          if (exId != exerciseId)
+            idsToExclude.append(data.id());
+        }
       }
-    }
-    FileManagement::MainFolder mainFolder = static_cast<FileManagement::MainFolder::type>(data.path()[0]);
+      FileManagement::MainFolder mainFolder = static_cast<FileManagement::MainFolder>(data.path()[0]);
     //qCritical() << "Folder = " << QString::fromStdString(data.name()) << ", mainFolder = " << mainFolder.underlying();
     if (!mainFolders.contains(mainFolder))
     {
-     // qCritical() << "Excluded id = " << data.m_id();
-      idsToExclude.append(data.m_id());
+     // qCritical() << "Excluded id = " << data.id();
+      idsToExclude.append(data.id());
     }
 
-    tmap.insert(data.m_id(), data);
+    tmap.insert(data.id(), data);
+    }
   };
   m_flmDtc->folders(cbFolders);
 
@@ -178,7 +182,7 @@ bool DialogModelFolder::initModel(int exerciseId, const QVector<FileManagement::
     }
     else // main Folders
     {
-      if (idsToExclude.contains(fld.m_id()))
+      if (idsToExclude.contains(fld.id()))
         continue;
     }
 
@@ -275,22 +279,22 @@ bool DialogModelProxyFolder::lessThan(const QModelIndex &source_left, const QMod
   if (!itemLeft || !itemRight)
     return QSortFilterProxyModel::lessThan(source_left, source_right);
 
-  const FileManagement::Folder left = itemLeft->data().value<FileManagement::Folder>();
-  const FileManagement::Folder right = itemRight->data().value<FileManagement::Folder>();
+  const FileManagement::Folder folderLeft = itemLeft->data().value<FileManagement::Folder>();
+  const FileManagement::Folder folderRight = itemRight->data().value<FileManagement::Folder>();
 
-  if (left.m_id() == FileManagement::MainFolder::GlobalDocuments   || right.m_id() == FileManagement::MainFolder::GlobalDocuments ||
-      left.m_id() == FileManagement::MainFolder::UserDocuments     || right.m_id() == FileManagement::MainFolder::UserDocuments   ||
-      left.m_id() == FileManagement::MainFolder::ExerciseDocuments || right.m_id() == FileManagement::MainFolder::ExerciseDocuments)
+  if (folderLeft.mainFolder() == FileManagement::MainFolder::GlobalDocuments   || folderRight.mainFolder() == FileManagement::MainFolder::GlobalDocuments ||
+      folderLeft.mainFolder() == FileManagement::MainFolder::UserDocuments     || folderRight.mainFolder() == FileManagement::MainFolder::UserDocuments   ||
+      folderLeft.mainFolder() == FileManagement::MainFolder::ExerciseDocuments || folderRight.mainFolder() == FileManagement::MainFolder::ExerciseDocuments)
   {
-    return left.m_id() < right.m_id();
+    return FileManagement::toInt(folderLeft.mainFolder()) < FileManagement::toInt(folderRight.mainFolder());
   }
 
-  if (QString::fromStdString(left.name()) != QString::fromStdString(right.name()))
+  if (QString::fromStdString(folderLeft.name()) != QString::fromStdString(folderRight.name()))
   {
-    return (QString::fromStdString(left.name()) < QString::fromStdString(right.name()));
+    return (QString::fromStdString(folderLeft.name()) < QString::fromStdString(folderRight.name()));
   }
 
-  return left.m_id() < right.m_id();
+  return folderLeft.id() < folderRight.id();
 }
 
 //----------------------------------------------------------------------------
@@ -325,7 +329,7 @@ bool DialogModelProxyFolder::filterAcceptsRow(int source_row, const QModelIndex
     // it's user folder -> check if it's in user documents and hide if it's not for the current operator
     for (int p : data.path())
     {
-      if (p == FileManagement::MainFolder::UserDocuments)
+      if (static_cast<FileManagement::MainFolder>(p) == FileManagement::MainFolder::UserDocuments)
         return false;
     }
   }
@@ -338,7 +342,8 @@ void DialogModelProxyFolder::setOperatorId(int operatorId)
   if (m_operatorId == operatorId)
     return;
   m_operatorId = operatorId;
-  invalidateFilter();
+  beginFilterChange();
+    endFilterChange();
 }
 
 } // namespace LtsWidgets

qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_dialog_model_folder.h

@@ -9,10 +9,10 @@
 
 #pragma once
 
-#include <Services/FileManagement/flm_dtc.h>
-#include <Services/ExerciseManagement/exm_dtc.h>
+#include <FileManagement/flm_dtc.h>
+#include <ExerciseManagement/exm_dtc.h>
 
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <nglwidgets/ngltreemodel.h>
 
 class QTableWidget;

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

@@ -13,9 +13,9 @@
 #include "lts_file_dialog_widget.h"
 #include "lts_dialog_model_folder.h"
 #include "lts_dialog_model_file.h"
-#include <Services/FileManagement/flm_translation.h>
+#include <FileManagement/flm_translation.h>
 
-#include <Viewer/LtsDataView/lts_data_view.h>
+#include <LtsDataView/lts_data_view.h>
 
 namespace LtsWidgets
 {
@@ -92,7 +92,7 @@ bool LtsFileDialog::init(LtsSession::LtsSession *session,
 //-----------------------------------------------------------------------------------------------------------
 int LtsFileDialog::getSelectedFileId() const
 {
-  return m_editItemWidget->m_selectedFileContent.m_id();
+  return m_editItemWidget->m_selectedFileContent.id();
 }
 
 //-----------------------------------------------------------------------------------------------------------

qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_file_dialog.h

@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include <Plugins/FileManagement/flm_data_plugin_interface.h>
-#include <Services/OperatorManagement/opm_dtc.h>
-#include <Services/ExerciseManagement/exm_dtc.h>
+#include <FileManagement/flm_data_plugin_interface.h>
+#include <OperatorManagement/opm_dtc.h>
+#include <ExerciseManagement/exm_dtc.h>
 
 #include <LtsWidgets/lts_dialog_button_box.h>
 #include <LtsWidgets/lts_frameless_dialog.h>
@@ -58,8 +58,8 @@ public:
             const QVector<FileManagement::MainFolder> &mainFolders = {},
             const QVector<FileManagement::FileType> &fileTypes = {FileManagement::FileType::Unknown},
             const int &folderId = 0,
-            const QString &buttonName = QString(),
-            const QString &xmlType = QString());
+            const QString &buttonName = QString{},
+            const QString &xmlType = QString{});
 
   int getSelectedFileId() const;
   FileManagement::FileContent getSelectedFile() const;

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

@@ -17,11 +17,12 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
 #include <nglwidgets/ngltreeitem.h>
-#include <Services/FileManagement/flm_translation.h>
+#include <FileManagement/flm_db.h>
+#include <FileManagement/flm_translation.h>
 #include <ConnectDialog/connect_dialog_nt.h>
 #include <LtsUtilsCore/dds_vector.h>
 
-#include <QItemSelectionModel>
+#include <QtCore/QItemSelectionModel>
 
 namespace LtsWidgets
 {
@@ -199,7 +200,7 @@ void LtsFileDialogWidget::onFolderSelectionChanged(const QItemSelection& /*selec
 //-----------------------------------------------------------------------------------------------------------
 void LtsFileDialogWidget::requestReadingSelectedFile()
 {
-  emit readSelectedFile(m_selectedFileContent.m_id());
+  emit readSelectedFile(m_selectedFileContent.id());
 }
 
 //-----------------------------------------------------------------------------------------------------------
@@ -227,7 +228,7 @@ void LtsFileDialogWidget::onChooseFileName()
 }
 
 //----------------------------------------------------------------------------
-void LtsFileDialogWidget::onFolderChanged(const FileManagement::Folder &data, DataModification modType)
+void LtsFileDialogWidget::onFolderChanged(const FileManagement::Folder &data, FileManagement::Interface::DataModification modType)
 {
   Q_UNUSED(data);
   Q_UNUSED(modType);
@@ -239,7 +240,7 @@ void LtsFileDialogWidget::onFolderChanged(const FileManagement::Folder &data, Da
 }
 
 //----------------------------------------------------------------------------
-void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data, DataModification modType)
+void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data, FileManagement::Interface::DataModification modType)
 {
   bool condition = showFile(data, m_xmlType);
 
@@ -249,17 +250,17 @@ void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data,
   if (selIndex.isValid())
     row = selIndex.row();
 
-  if (modType == DataModification::eRemoved)
+  if (modType == FileManagement::Interface::DataModification::eRemoved)
   {
     m_modelFile->removeRow(row);
     return;
   }
-  if (modType == DataModification::eAdded && condition)
+  if (modType == FileManagement::Interface::DataModification::eAdded && condition)
   {
     m_modelFile->insertRow(data);
     return;
   }
-  if (modType == DataModification::eModified && condition)
+  if (modType == FileManagement::Interface::DataModification::eModified && condition)
   {
     m_modelFile->setRowData(row, data);
     return;
@@ -269,7 +270,7 @@ void LtsFileDialogWidget::onFileChanged(const FileManagement::FileContent &data,
 //-----------------------------------------------------------------------------------------------------------
 QString LtsFileDialogWidget::dragMimeType() const
 {
-  return (m_modelFile) ? m_modelFile->mimeTypes().value(0) : QString();
+  return (m_modelFile) ? m_modelFile->mimeTypes().value(0) : QString{};
 }
 
 //-----------------------------------------------------------------------------------------------------------
@@ -300,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).m_id();
+    m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id();
   }
   else
   {
@@ -321,7 +322,7 @@ void LtsFileDialogWidget::enaDisa()
     m_selectedFileContent = FileManagement::FileContent();
     if (m_dialogMode != FileDialogMode::modeSaveFile)
     {
-      m_fileName = QString();
+      m_fileName = QString{};
       m_ui->leFile->setText(m_fileName);
     }
   }

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

@@ -13,11 +13,12 @@
 #include "lts_file_dialog.h"
 
 #include <LtsFileDialog/ltsfiledialog_export.h>
-#include <Plugins/FileManagement/flm_data_plugin_interface.h>
-#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
-#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
+#include <FileManagement/flm_data_plugin_interface.h>
+#include <FileManagement/flm_dtc.h>
+#include <OperatorManagement/opm_data_plugin_interface.h>
+#include <ExerciseManagement/exm_data_plugin_interface.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 namespace LtsWidgets
 {
@@ -43,7 +44,7 @@ public:
             const QVector<FileManagement::MainFolder> &mainFolders = {},
             const QVector<FileManagement::FileType> &fileTypes = {FileManagement::FileType::Unknown},
             const int &folderId = 0,
-            const QString &xmlType = QString());
+            const QString &xmlType = QString{});
 
   void requestReadingSelectedFile();
   QString dragMimeType() const;
@@ -64,12 +65,12 @@ protected slots:
   // folders
   void onFolderSelectionChanged(const QItemSelection & /*selected*/,
                                 const QItemSelection& /*deselected*/);
-  void onFolderChanged(const FileManagement::Folder &data, DataModification modType);
+  void onFolderChanged(const FileManagement::Folder &data, FileManagement::Interface::DataModification modType);
 
   // files
   FileManagement::FileContent onSelectFile();
   void onChooseFileName();
-  void onFileChanged(const FileManagement::FileContent &data, DataModification modType);
+  void onFileChanged(const FileManagement::FileContent &data, FileManagement::Interface::DataModification modType);
   bool showFile(const FileManagement::FileContent &fc, const QString &xmlType);
 
 private:

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

@@ -8,7 +8,7 @@
   */
 
 #include "lts_file_dialog.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <DDS/DDSConnector/dds_connector.h>