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

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