COMP/PERF: Qt deprecation fixes and range-loop detach prevention

Libs/Core/Testing/Cpp/ctkBackTraceTest.cpp

@@ -36,7 +36,7 @@ void Q_DECL_EXPORT bt_func1()
   bool foundBackTrace = false;
   bool foundFunc1 = false;
   bool foundFunc2 = false;
-  for (const QString& frame : trace)
+  for (const QString& frame : std::as_const(trace))
   {
     if (frame.contains("ctkBackTrace"))
     {

Libs/Core/ctkAbstractJob.h

@@ -90,7 +90,7 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
     Failed,
     Finished,
   };
-  Q_ENUM(JobStatus)
+  Q_ENUM(JobStatus);
   JobStatus status() const;
   virtual void setStatus(JobStatus status);
   ///@}

Libs/DICOM/Core/ctkDICOMFilterProxyModel.cpp

@@ -66,29 +66,57 @@ ctkDICOMFilterProxyModel::~ctkDICOMFilterProxyModel(){
 //----------------------------------------------------------------------------
 void ctkDICOMFilterProxyModel::setNameSearchText(const QString &text){
     Q_D(ctkDICOMFilterProxyModel);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    this->beginFilterChange();
+#endif
     d->searchTextName = text;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
 }
 
 //----------------------------------------------------------------------------
 void ctkDICOMFilterProxyModel::setStudySearchText(const QString &text){
     Q_D(ctkDICOMFilterProxyModel);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    this->beginFilterChange();
+#endif
     d->searchTextStudy = text;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
 }
 
 //----------------------------------------------------------------------------
 void ctkDICOMFilterProxyModel::setSeriesSearchText(const QString &text){
     Q_D(ctkDICOMFilterProxyModel);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    this->beginFilterChange();
+#endif
     d->searchTextSeries = text;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
 }
 
 //----------------------------------------------------------------------------
 void ctkDICOMFilterProxyModel::setIdSearchText(const QString &text){
     Q_D(ctkDICOMFilterProxyModel);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    this->beginFilterChange();
+#endif
     d->searchTextID = text;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
 }
 
 bool ctkDICOMFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const{

Libs/DICOM/Core/ctkDICOMJob.h

@@ -60,7 +60,7 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMJob : public ctkAbstractJob
     Series,
     Instances
   };
-  Q_ENUM(DICOMLevels)
+  Q_ENUM(DICOMLevels);
 
   ///@{
   /// DICOM Level

Libs/DICOM/Core/ctkDICOMPatientFilterProxyModel.cpp

@@ -107,7 +107,12 @@ void ctkDICOMPatientFilterProxyModel::setDisplayMode(DisplayMode mode)
   d->DisplayMode = mode;
 
   // Trigger re-filtering
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+  this->beginFilterChange();
+  this->endFilterChange();
+#else
   this->invalidateFilter();
+#endif
 
   emit displayModeChanged(mode);
 }
@@ -217,7 +222,12 @@ void ctkDICOMPatientFilterProxyModel::setWidgetWidth(int width)
   {
     d->WidgetWidth = width;
     d->FirstOutOfBoundsRow = -1;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->beginFilterChange();
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
   }
 }
 
@@ -236,7 +246,12 @@ void ctkDICOMPatientFilterProxyModel::setMaxTextWidth(int width)
   {
     d->MaxTextWidth = width;
     d->FirstOutOfBoundsRow = -1;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->beginFilterChange();
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
   }
 }
 
@@ -255,7 +270,12 @@ void ctkDICOMPatientFilterProxyModel::setIconSize(int size)
   {
     d->IconSize = size;
     d->FirstOutOfBoundsRow = -1;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->beginFilterChange();
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
   }
 }
 
@@ -274,7 +294,12 @@ void ctkDICOMPatientFilterProxyModel::setSpacing(int spacing)
   {
     d->Spacing = spacing;
     d->FirstOutOfBoundsRow = -1;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+    this->beginFilterChange();
+    this->endFilterChange();
+#else
     this->invalidateFilter();
+#endif
   }
 }
 

Libs/DICOM/Core/ctkDICOMPatientModel.cpp

@@ -224,7 +224,7 @@ void ctkDICOMPatientModelPrivate::populatePatients()
 
   // Create a set of existing patient items for quick lookup
   QSet<QString> existingPatientUIDs;
-  for (const PatientData& patient : this->Patients)
+  for (const PatientData& patient : std::as_const(this->Patients))
   {
     existingPatientUIDs.insert(patient.patientUID);
   }
@@ -360,7 +360,7 @@ void ctkDICOMPatientModelPrivate::populatePatients()
   // Update allowed servers from database for newly added patients
   if (!newPatients.isEmpty())
   {
-    for (const PatientData& patientData : newPatients)
+    for (const PatientData& patientData : std::as_const(newPatients))
     {
       q->updateAllowedServersFromDB(patientData.patientUID);
     }
@@ -433,7 +433,7 @@ int ctkDICOMPatientModelPrivate::getSeriesCountForPatient(const QString& patient
   {
     return 0;
   }
-  QStringList studyInstanceUIDs = studyModel->studyInstanceUIDs();
+  const QStringList studyInstanceUIDs = studyModel->studyInstanceUIDs();
   int totalSeriesCount = 0;
   for (const QString& studyInstanceUID : studyInstanceUIDs)
   {
@@ -458,7 +458,7 @@ int ctkDICOMPatientModelPrivate::getFilteredSeriesCountForPatient(const QString&
   {
     return 0;
   }
-  QStringList filteredStudyInstanceUIDs = studyModel->filteredStudyInstanceUIDs();
+  const QStringList filteredStudyInstanceUIDs = studyModel->filteredStudyInstanceUIDs();
   int totalFilteredSeriesCount = 0;
   for (const QString& studyInstanceUID : filteredStudyInstanceUIDs)
   {
@@ -1791,7 +1791,7 @@ void ctkDICOMPatientModel::updateAllowedServersFromDB(const QString& patientUID)
   QStringList denyList = connectionsInformation["deny"];
 
   QStringList allowedServers;
-  for (const QString& connectionName : allActiveConnectionNames)
+  for (const QString& connectionName : std::as_const(allActiveConnectionNames))
   {
     if (allowList.contains(connectionName))
     {
@@ -1853,7 +1853,7 @@ void ctkDICOMPatientModel::saveAllowedServersToDB(const QString& patientUID, con
   QStringList databaseAllowList;
   QStringList databaseDenyList;
 
-  for (const QString& connectionName : allActiveConnectionNames)
+  for (const QString& connectionName : std::as_const(allActiveConnectionNames))
   {
     if (allowedServers.contains(connectionName))
     {

Libs/DICOM/Core/ctkDICOMSeriesModel.cpp

@@ -1009,7 +1009,7 @@ void ctkDICOMSeriesModel::forceUpdateSeriesJobs(const QString &seriesInstanceUID
     // Stop running or waiting jobs
     QStringList jobUIDs;
     // Restart the failed job
-    for (QSharedPointer<ctkAbstractJob> job : runningJobs)
+    for (const QSharedPointer<ctkAbstractJob>& job : std::as_const(runningJobs))
     {
       jobUIDs.append(job->jobUID());
     }
@@ -1019,7 +1019,7 @@ void ctkDICOMSeriesModel::forceUpdateSeriesJobs(const QString &seriesInstanceUID
   {
     QStringList jobUIDs;
     // Restart the failed job
-    for (QSharedPointer<ctkAbstractJob> job : failedJobs)
+    for (const QSharedPointer<ctkAbstractJob>& job : std::as_const(failedJobs))
     {
       jobUIDs.append(job->jobUID());
     }
@@ -1542,7 +1542,7 @@ void ctkDICOMSeriesModel::updateGUIFromScheduler(const QVariant& data, const boo
 
     this->refresh();
 
-    for (const QString& seriesInstanceUID : td.QueriedSeriesInstanceUIDs)
+    for (const QString& seriesInstanceUID : std::as_const(td.QueriedSeriesInstanceUIDs))
     {
       int linearIndex = d->findSeriesLinearIndex(seriesInstanceUID);
       if (linearIndex < 0)

Libs/DICOM/Core/ctkDICOMStudyModel.cpp

@@ -263,7 +263,7 @@ void ctkDICOMStudyModelPrivate::populateStudies()
 
   // Create a set of existing study instance UIDs for quick lookup
   QSet<QString> existingStudyUIDs;
-  for (const StudyData& study : this->Studies)
+  for (const StudyData& study : std::as_const(this->Studies))
   {
     existingStudyUIDs.insert(study.studyInstanceUID);
   }
@@ -1563,7 +1563,7 @@ void ctkDICOMStudyModel::forceUpdateStudyJobs(const QString &studyInstanceUID)
     // Stop running or waiting jobs
     QStringList jobUIDs;
     // Restart the failed job
-    for (QSharedPointer<ctkAbstractJob> job : runningJobs)
+    for (const QSharedPointer<ctkAbstractJob>& job : std::as_const(runningJobs))
     {
       jobUIDs.append(job->jobUID());
     }
@@ -1573,7 +1573,7 @@ void ctkDICOMStudyModel::forceUpdateStudyJobs(const QString &studyInstanceUID)
   {
     QStringList jobUIDs;
     // Restart the failed job
-    for (QSharedPointer<ctkAbstractJob> job : failedJobs)
+    for (const QSharedPointer<ctkAbstractJob>& job : std::as_const(failedJobs))
     {
       jobUIDs.append(job->jobUID());
     }
@@ -1611,7 +1611,7 @@ void ctkDICOMStudyModel::updateGUIFromScheduler(const QVariant& data)
 
     // Sort study UIDs by date/time (most recent first) using the same logic as proxy models
     QList<QPair<QDateTime, QString>> studyDateTimePairs;
-    for (const QString& studyInstanceUID : td.QueriedStudyInstanceUIDs)
+    for (const QString& studyInstanceUID : std::as_const(td.QueriedStudyInstanceUIDs))
     {
       QModelIndex idx = this->indexFromStudyInstanceUID(studyInstanceUID);
       QString studyDate = this->data(idx, ctkDICOMStudyModel::StudyDateRole).toString();

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp

@@ -265,7 +265,8 @@ void ctkDICOMQueryRetrieveWidget::query()
 
     d->QueriesByServer[d->CurrentServer] = query;
 
-    for (const auto & StudyAndSeriesInstanceUIDPair : query->studyAndSeriesInstanceUIDQueried() )
+    const auto queriedPairs = query->studyAndSeriesInstanceUIDQueried();
+    for (const auto & StudyAndSeriesInstanceUIDPair : queriedPairs )
     {
       d->QueriesByStudyUID[StudyAndSeriesInstanceUIDPair.first] = query;
       d->StudyAndSeriesInstanceUIDPairList.push_back(qMakePair( StudyAndSeriesInstanceUIDPair.first, StudyAndSeriesInstanceUIDPair.second ));

Libs/DICOM/Widgets/ctkDICOMVisualBrowserWidget.cpp

@@ -2887,7 +2887,7 @@ void ctkDICOMVisualBrowserWidget::onStudiesSortedByDate(const QStringList& sorte
 
   // Find which patient these studies belong to
   QString patientID;
-  QList<ctkDICOMStudyModel*> studyModels = d->PatientModel->allStudyModels();
+  const QList<ctkDICOMStudyModel*> studyModels = d->PatientModel->allStudyModels();
   for (ctkDICOMStudyModel* studyModel : studyModels)
   {
     if (studyModel && studyModel->studyInstanceUIDs().contains(sortedStudyInstanceUIDs.first()))
@@ -2919,7 +2919,7 @@ void ctkDICOMVisualBrowserWidget::onStudyReadyToOpen(const QString& studyInstanc
 
   // Get the patient ID for this study
   QString patientID;
-  QList<ctkDICOMStudyModel*> studyModels = d->PatientModel->allStudyModels();
+  const QList<ctkDICOMStudyModel*> studyModels = d->PatientModel->allStudyModels();
   for (ctkDICOMStudyModel* studyModel : studyModels)
   {
     if (studyModel && studyModel->studyInstanceUIDs().contains(studyInstanceUID))
@@ -3296,7 +3296,7 @@ void ctkDICOMVisualBrowserWidget::onSeriesDoubleClicked(const QString& seriesIns
   ctkDICOMStudyListView* studyListView = d->PatientView->studyListView();
   if (studyListView)
   {
-    QMap<QString, ctkDICOMSeriesTableView*> allSeriesViews = studyListView->getAllSeriesView();
+    const QMap<QString, ctkDICOMSeriesTableView*> allSeriesViews = studyListView->getAllSeriesView();
     for (ctkDICOMSeriesTableView* seriesView : allSeriesViews)
     {
       if (seriesView)
@@ -3383,10 +3383,10 @@ void ctkDICOMVisualBrowserWidget::removePatients(const QStringList& patientUIDs)
   QStringList loadedSeriesInstanceUIDs = d->DicomDatabase->loadedSeriesInstanceUIDs();
   foreach (const QString& patientUID, patientUIDs)
   {
-    QStringList studyInstanceUIDs = d->DicomDatabase->studiesForPatient(patientUID);
+    const QStringList studyInstanceUIDs = d->DicomDatabase->studiesForPatient(patientUID);
     for (const QString& studyInstanceUID : studyInstanceUIDs)
     {
-      QStringList seriesInstanceUIDs = d->DicomDatabase->seriesForStudy(studyInstanceUID);
+      const QStringList seriesInstanceUIDs = d->DicomDatabase->seriesForStudy(studyInstanceUID);
       for (const QString& seriesInstanceUID : seriesInstanceUIDs)
       {
         loadedSeriesInstanceUIDs.removeAll(seriesInstanceUID);
@@ -3487,7 +3487,7 @@ void ctkDICOMVisualBrowserWidget::removeStudies(const QStringList& studyInstance
   QStringList loadedSeriesInstanceUIDs = d->DicomDatabase->loadedSeriesInstanceUIDs();
   foreach (const QString& studyInstanceUID, studyInstanceUIDs)
   {
-    QStringList seriesInstanceUIDs = d->DicomDatabase->seriesForStudy(studyInstanceUID);
+    const QStringList seriesInstanceUIDs = d->DicomDatabase->seriesForStudy(studyInstanceUID);
     for (const QString& seriesInstanceUID : seriesInstanceUIDs)
     {
       loadedSeriesInstanceUIDs.removeAll(seriesInstanceUID);
@@ -3743,7 +3743,7 @@ void ctkDICOMVisualBrowserWidget::onLoadSeries(const QStringList& seriesInstance
     {
       emit seriesRetrieved(retrievedSeriesInstanceUIDs);
       QStringList loadedSeriesInstanceUIDs = d->DicomDatabase->loadedSeriesInstanceUIDs();
-      for (const QString& uid : retrievedSeriesInstanceUIDs)
+      for (const QString& uid : std::as_const(retrievedSeriesInstanceUIDs))
       {
         if (!loadedSeriesInstanceUIDs.contains(uid))
         {

Libs/Scripting/Python/Core/ctkAbstractPythonManager.h

@@ -96,7 +96,7 @@ class CTK_SCRIPTING_PYTHON_CORE_EXPORT ctkAbstractPythonManager : public QObject
     FileInput,
     SingleInput
   };
-  Q_ENUM(ExecuteStringMode)
+  Q_ENUM(ExecuteStringMode);
 
   /// Execute a python of python code (can be multiple lines separated with newline)
   /// and return the result as a QVariant.

Libs/Visualization/VTK/Widgets/ctkVTKMagnifyView.cpp

@@ -382,7 +382,11 @@ void ctkVTKMagnifyViewPrivate::updatePixmap()
   }
   pixelData->Delete();
   image = image.rgbSwapped();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+  image = image.flipped();
+#else
   image = image.mirrored();
+#endif
 
   // Scale the image to zoom, using FastTransformation to prevent smoothing
   QSize imageSize = actualSize * this->Magnification;

Libs/Visualization/VTK/Widgets/ctkVTKWidgetsUtils.cpp

@@ -132,7 +132,11 @@ QImage ctk::vtkImageDataToQImage(vtkImageData* imageData)
   // Qt image is upside-down compared to VTK, so return mirrored image.
   // Mirroring also takes care of the pixel buffer ownership, because mirroring deep-copies the pixel buffer
   // (therefore the returned QImage() owns its own pixel buffer).
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+  return image.flipped();
+#else
   return image.mirrored();
+#endif
 }
 
 //----------------------------------------------------------------------------
@@ -157,17 +161,23 @@ bool ctk::qImageToVTKImageData(const QImage& inputQImage, vtkImageData* outputVT
   vtkIdType numberOfScalarComponents = 0;
   if (inputQImage.hasAlphaChannel() || forceAlphaChannel)
   {
-#if QT_VERSION >= QT_VERSION_CHECK(5,2,0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    normalizedQtImage = inputQImage.convertToFormat(QImage::Format_RGBA8888).flipped();
+#elif QT_VERSION >= QT_VERSION_CHECK(5,2,0)
     normalizedQtImage = inputQImage.convertToFormat(QImage::Format_RGBA8888).mirrored();
-    numberOfScalarComponents = 4;
 #else
     qWarning() << Q_FUNC_INFO << " failed: conversion of 4-component image is not available with Qt < 5.2";
     return false;
 #endif
+    numberOfScalarComponents = 4;
   }
   else
   {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    normalizedQtImage = inputQImage.convertToFormat(QImage::Format_RGB888).flipped();
+#else
     normalizedQtImage = inputQImage.convertToFormat(QImage::Format_RGB888).mirrored();
+#endif
     numberOfScalarComponents = 3;
   }