Index: leahi.pro
===================================================================
diff -u -r48150735f4c4d84647ade9162ebb9757af9d87a0 -r9409e95998fd4e181b5c8a5b87c6757fac1ee0f1
--- leahi.pro	(.../leahi.pro)	(revision 48150735f4c4d84647ade9162ebb9757af9d87a0)
+++ leahi.pro	(.../leahi.pro)	(revision 9409e95998fd4e181b5c8a5b87c6757fac1ee0f1)
@@ -60,6 +60,7 @@
     sources/model/td \
     sources/model/td/data \
     sources/model/td/data/treatment \
+    sources/model/td/data/pretreatment \
     sources/model/td/data/treatmentlog \
     sources/model/td/data/pretreatment \
     sources/model/td/alarm \
@@ -188,8 +189,8 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \
-    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -203,8 +204,6 @@
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
     sources/model/td/data/MWaterSampleData.h \
-    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
-    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/td/data/treatment/MTreatmentHDFData.h \
@@ -236,6 +235,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \
+    \ # ---------- Models - TD - Data - Pre-Treatment
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \
@@ -276,7 +278,6 @@
     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 \
@@ -574,10 +575,10 @@
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \
-    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
     sources/model/td/data/MTDAirBubbleData.cpp \
@@ -590,8 +591,6 @@
     sources/model/td/data/MTDValvesData.cpp \
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/MWaterSampleData.cpp \
-    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
-    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     sources/model/td/data/MTDSyringePumpData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
@@ -646,6 +645,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \
+    \ # ---------- Models - Data - States
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
@@ -765,7 +767,6 @@
     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 \
@@ -794,8 +795,8 @@
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
     sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \
-    sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \
     sources/view/td/data/treatment/VTreatmentHDFData.cpp \
+    sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \
     sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
     sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \