Index: leahi.pro
===================================================================
diff -u -rdf61c476838011a343a6930fd5b30404629379bc -rd62949c62c5512952e86a427285ef0dc72344248
--- leahi.pro	(.../leahi.pro)	(revision df61c476838011a343a6930fd5b30404629379bc)
+++ leahi.pro	(.../leahi.pro)	(revision d62949c62c5512952e86a427285ef0dc72344248)
@@ -198,6 +198,8 @@
     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 \
@@ -289,6 +291,9 @@
     sources/view/td/data/VTreatmentRanges.h \
     sources/view/td/data/VWaterSampleData.h \
     sources/view/td/data/VTDSyringePumpData.h \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \
+    sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
@@ -328,7 +333,7 @@
     \ # ---------- Views - TD - Adjustment - Pre-Treatment
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
-    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \    
     \ # ---------- Views - TD - Adjustment - Post-Treatment
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
@@ -403,7 +408,6 @@
     \ # ---------- Models - HD - Data - Pre-Treatment - Progress
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \
-    sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MHDDebugText.h \
     sources/model/hd/data/MHDGeneralEvent.h \
@@ -497,7 +501,6 @@
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \
-    sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/post/VHDPOSTData.h \
     sources/view/hd/data/VHDAccelerometerData.h \
@@ -585,6 +588,9 @@
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/MWaterSampleData.cpp \
     sources/model/td/data/MTDSyringePumpData.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 \
     sources/model/td/data/treatment/MTreatmentHDFData.cpp \
@@ -727,7 +733,6 @@
     sources/model/hd/data/post/MHDRTCEpochData.cpp \
     sources/model/hd/data/MHDUsageInfoResponse.cpp \
     \ # ---------- Models - HD - Data - Pre-Treatment
-    sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \
     \ # ---------- Models - DG - Adjustment - Settings
@@ -781,6 +786,9 @@
     sources/view/td/data/VTreatmentRanges.cpp \
     sources/view/td/data/VWaterSampleData.cpp \
     sources/view/td/data/VTDSyringePumpData.cpp \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \
+    sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
@@ -820,7 +828,7 @@
     \ # ---------- Views - TD - Adjustment - Pre-Treatment
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
     sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
-    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
+    sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \    
     \ # ---------- Views - TD - Adjustment - Post-Treatment
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
     sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
@@ -875,7 +883,6 @@
     \ # ---------- Views - HD - Data - Pre-Treatment
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
-    sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Views - HD - Data - In-Treatment
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
     sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \