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

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);
     }
   }