Index: leahi.pro
===================================================================
diff -u -r3946bf96b758f8b62c3269c03cb4dca41594aedf -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- leahi.pro	(.../leahi.pro)	(revision 3946bf96b758f8b62c3269c03cb4dca41594aedf)
+++ leahi.pro	(.../leahi.pro)	(revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -61,6 +61,7 @@
     sources/model/td/data \
     sources/model/td/data/treatment \
     sources/model/td/data/treatmentlog \
+    sources/model/td/data/pretreatment \
     sources/model/td/alarm \
     sources/model/td/adjustment \
     sources/model/td/adjustment/settings \
@@ -79,6 +80,7 @@
     sources/view/td \
     sources/view/td/data \
     sources/view/td/data/treatment \
+    sources/view/td/data/pretreatment \
     sources/view/td/adjustment/treatment \
     sources/view/td/adjustment/pretreatment \
     sources/view/td/adjustment/posttreatment \
@@ -197,6 +199,7 @@
     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/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \
@@ -282,6 +285,8 @@
     sources/view/td/data/VTDVoltageData.h \
     sources/view/td/data/VTreatmentRanges.h \
     sources/view/td/data/VWaterSampleData.h \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
@@ -366,7 +371,6 @@
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmActiveList.h \
     \ # ---------- Models - States Data
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
@@ -480,7 +484,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \
@@ -571,6 +574,7 @@
     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/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \
@@ -663,7 +667,6 @@
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmActiveList.cpp \
     \ # ---------- Models - Data - States
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
     \ # ---------- Models - TD - Adjustment - Settings
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
@@ -761,6 +764,8 @@
     sources/view/td/data/VTDVoltageData.cpp \
     sources/view/td/data/VTreatmentRanges.cpp \
     sources/view/td/data/VWaterSampleData.cpp \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
@@ -844,7 +849,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \