Index: sources/device/DeviceModels.cpp
===================================================================
diff -u -r6e18f1d24b8cc3d84d26f46f36f73deb34e54371 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b
--- sources/device/DeviceModels.cpp	(.../DeviceModels.cpp)	(revision 6e18f1d24b8cc3d84d26f46f36f73deb34e54371)
+++ sources/device/DeviceModels.cpp	(.../DeviceModels.cpp)	(revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b)
@@ -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 -r6db0bf1974b688a3650db2a396590e079c477074 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b
--- sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision 6db0bf1974b688a3650db2a396590e079c477074)
+++ sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b)
@@ -431,7 +431,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/view/settings/VSettings.cpp
===================================================================
diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b)
@@ -141,7 +141,7 @@
                     keys.append(key);
                 }
 
-                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) ) {
@@ -219,6 +219,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];
@@ -249,6 +251,7 @@
         keyList  += key;
         keysList += keyList;
     }
+*/
     return keysList;
 }
 
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b)
@@ -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;