Index: sources/device/DeviceModels.cpp
===================================================================
diff -u -rbf9223700613ced6c377f3e3a7b4de8367c30474 -rbc425138c540402c9a9867bf34757e896507eea8
--- sources/device/DeviceModels.cpp	(.../DeviceModels.cpp)	(revision bf9223700613ced6c377f3e3a7b4de8367c30474)
+++ sources/device/DeviceModels.cpp	(.../DeviceModels.cpp)	(revision bc425138c540402c9a9867bf34757e896507eea8)
@@ -230,7 +230,9 @@
 
     // get the value
     QString val         = vByteArray;
-    ok = ! val.isNull() && val.isSimpleText();
+    // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText().
+    // ok = ! val.isNull() && val.isSimpleText();
+    ok = ! val.isNull();
 
     // check if the vExitCode passed and it has a value other than zero
     if ( ! ok                       ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type    ;   goto lError;  } // there is not a valid value
Index: sources/device/DeviceView.cpp
===================================================================
diff -u -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd -rbc425138c540402c9a9867bf34757e896507eea8
--- sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd)
+++ sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision bc425138c540402c9a9867bf34757e896507eea8)
@@ -432,7 +432,7 @@
     QList<QHash<int, QVariant>> supported;
     QList<QHash<int, QVariant>> unsupported;
 
-    for (const auto &ssid: qAsConst(ssidInfoList)) {
+    for (const auto &ssid: std::as_const(ssidInfoList)) {
         bool inUse = ssid.mSSID == _ssid;
         QHash<int, QVariant> vData;
         vData[eRole_WifiMacAddress    ] = ssid.mBSSID           ;
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r1df84ec72872967e283b8979e14c2753b740064a -rbc425138c540402c9a9867bf34757e896507eea8
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 1df84ec72872967e283b8979e14c2753b740064a)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision bc425138c540402c9a9867bf34757e896507eea8)
@@ -233,7 +233,8 @@
 /*0197*/case GuiAlarmID::ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE                 : { result = QObject::tr("DD D92 pump rpm out of range."                                                                         ); break; } /* 197*/
 /*0198*/case GuiAlarmID::ALARM_ID_TD_PRIME_COMPLETED_MEDIUM                    : { result = QObject::tr("TD prime completed medium priority alarm."                                                             ); break; } /* 198*/
 /*0199*/case GuiAlarmID::ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS            : { result = QObject::tr("TD repeated air trap lower events."                                                                    ); break; } /* 199*/
-/*0200*/case GuiAlarmID::NUM_OF_ALARM_IDS                                      : { result = QObject::tr("Number of alarms."                                                                                     ); break; } /* 200*/
+/*0200*/case GuiAlarmID::ALARM_ID_TD_TUBE_SET_MISMATCH                         : { result = QObject::tr("TD tubeset mismatch alarm."                                                                            ); break; } /* 200*/
+/*0201*/case GuiAlarmID::NUM_OF_ALARM_IDS                                      : { result = QObject::tr("Number of alarms."                                                                                     ); break; } /* 201*/
                                                                                    
     default:                                                                       
         result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));      
Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd -rbc425138c540402c9a9867bf34757e896507eea8
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision bc425138c540402c9a9867bf34757e896507eea8)
@@ -136,7 +136,7 @@
                                      updateInstructions(group                           );
             }
             else { //TODO: Since it is global system settings, move this to the settings controller so the C++ backend can also use it. like Date/Time formats.
-                for (const auto &key : qAsConst(keys)) {
+                for (const auto &key : std::as_const(keys)) {
                     // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString  ();
                     QVariantMap           keyValue;
                     if ( isservicePass      (category, group, key) ) {
@@ -214,6 +214,8 @@
 VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup, const QStringList &vKeys)
 {
     TKeysList keysList;
+    Q_UNUSED(vGroup); Q_UNUSED(vKeys) // TODO: Qt6 port - remove
+/* TODO: Qt6 port - QRegularExpression
     for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) {
         QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}");
         QString key = vKeys[keyIndex];
@@ -244,6 +246,7 @@
         keyList  += key;
         keysList += keyList;
     }
+*/
     return keysList;
 }
 
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -rbc425138c540402c9a9867bf34757e896507eea8
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision bc425138c540402c9a9867bf34757e896507eea8)
@@ -68,13 +68,11 @@
     ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                               ) {
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                                           )
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE                            )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE                             )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE                          )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE                                    )
     ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES                                        ) }
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                   , sbIdle                );
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE    , sbWaitPump            );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE     , sbRunning             );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE  , sbSubstitutionRunning );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE  , sbSubstitutionRunning           );
 
     // Heparin States
     _heparin                = false;