Index: leahi.pro
===================================================================
diff -u -r6b0a4712aa142d35ca068e53830184f1b5395210 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677
--- leahi.pro	(.../leahi.pro)	(revision 6b0a4712aa142d35ca068e53830184f1b5395210)
+++ leahi.pro	(.../leahi.pro)	(revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677)
@@ -157,6 +157,8 @@
     sources/model/confirm/MDuetConfirmTDi.h \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \
     sources/model/dd/data/MDDBloodLeakData.h \
     sources/model/dd/data/MDDConcentratePumpData.h \
     sources/model/dd/data/MDDConductivityData.h \
@@ -181,6 +183,7 @@
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \
@@ -268,8 +271,10 @@
     sources/view/fp/data/VFPROPumpData.h \
     sources/view/fp/data/VFPRORejectionPercentageData.h \
     sources/view/fp/data/VFPTemperatureData.h \
+    sources/view/settings/VAdjustRoWaterMode.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
+    sources/view/settings/VRoWaterMode.h \
     sources/view/settings/VCalibrationSettings.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \
@@ -366,7 +371,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
@@ -377,8 +381,6 @@
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
@@ -461,7 +463,6 @@
     sources/view/settings/VAdjustmentServiceMode.h \
     sources/view/settings/VAdjustmentServiceDates.h \
     sources/view/settings/VAdjustmentDGCleaningUsage.h \
-    sources/view/settings/VDuetRoWaterDG.h \
     sources/view/settings/VCloudSync.h \
     sources/view/settings/VHDUsageInfo.h \
     sources/view/settings/VAdjustmentInstitutionalRecord.h \
@@ -539,6 +540,8 @@
     sources/model/confirm/MDuetConfirmTDi.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \
     sources/model/dd/data/MDDBloodLeakData.cpp \
     sources/model/dd/data/MDDConcentratePumpData.cpp \
     sources/model/dd/data/MDDConductivityData.cpp \
@@ -666,7 +669,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmMapping.cpp \
@@ -679,6 +681,7 @@
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
     sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \
     \ # ---------- Models - TD - Adjustment - Pre-Treatment
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
@@ -691,8 +694,6 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
     \ # ---------- Models - DD - Adjustment - Settings
     sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
@@ -755,8 +756,10 @@
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
     \ # ---------- Views - TD - States Data
+    sources/view/settings/VAdjustRoWaterMode.cpp \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+    sources/view/settings/VRoWaterMode.cpp \
     sources/view/settings/VCalibrationSettings.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \
@@ -833,7 +836,6 @@
     sources/view/settings/VAdjustmentAlarmVolume.cpp \
     sources/view/settings/VAdjustmentServiceMode.cpp \
     sources/view/settings/VAdjustmentServiceDates.cpp \
-    sources/view/settings/VDuetRoWaterDG.cpp \
     sources/view/settings/VCloudSync.cpp \
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
     sources/view/settings/VHDUsageInfo.cpp \