Index: denali.pro
===================================================================
diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -re0412efcf85964a18ec52ad80f233c45998eb45a
--- denali.pro	(.../denali.pro)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
+++ denali.pro	(.../denali.pro)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -63,9 +63,6 @@
     sources/model/MModel.h \
     #sources/model/MAbstractProgressData.h \
     sources/model/MAbstract.h \
-    sources/model/MPowerOff.h \
-    sources/model/MStartTreatmentResponse.h \
-    sources/model/MTreatmentParametersResp.h \
     sources/model/MDGDebugText.h \
     sources/model/MHDDebugText.h \
     \ # ---------- Models - Alarm
@@ -74,12 +71,23 @@
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmClearedCondition.h \
     \ # ---------- Models - HD - Adjustment
-    sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \
+    sources/model/hd/adjustment/MAdjustRequestsBase.h \
+    sources/model/hd/adjustment/MAdjustPowerOff.h \
+    sources/model/hd/adjustment/MAdjustHDVersionsResponse.h \
+    \ # ---------- Models - HD - Adjustment - Pre-Treatment
+    sources/model/hd/adjustment/MPreTreatmentAdjustRequests.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.h \
     \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/MTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \
-    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
@@ -97,7 +105,7 @@
     \ # ---------- Models - HD - Data - Pre-Treatment - Progress
     sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \
     sources/model/hd/data/MPreTreatmentSelfTestDryData.h \
-    sources/model/hd/data/MPreTreatmentPrimeData.h \
+    sources/model/hd/data/MPreTreatmentDisposablePrimeData.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MTreatmentTimeData.h \
@@ -111,7 +119,7 @@
     sources/model/hd/data/MTreatmentRecirculateData.h \
     sources/model/hd/data/MTreatmentBloodPrimeData.h \
     \ # ---------- Models - DG - Adjustment
-    sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \
+    sources/model/dg/adjustment/MAdjustDGVersionsResponse.h \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data
@@ -170,7 +178,7 @@
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \
     sources/view/hd/data/VPreTreatmentSelfTestDryData.h \
-    sources/view/hd/data/VPreTreatmentPrimeData.h \
+    sources/view/hd/data/VPreTreatmentDisposablePrimeData.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VTreatmentTime.h \
@@ -224,22 +232,28 @@
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
 #    sources/model/MAbstractProgressData.cpp \
-    sources/model/MPowerOff.cpp \
     sources/model/MHDDebugText.cpp \
-    sources/model/MStartTreatmentResponse.cpp \
-    sources/model/MTreatmentParametersResp.cpp \
     sources/model/MDGDebugText.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmClearedCondition.cpp \
+    \ # ---------- Models - HD - Adjustment
+    sources/model/hd/adjustment/MAdjustPowerOff.cpp \
+    sources/model/hd/adjustment/MAdjustHDVersionsResponse.cpp \
+    \ # ---------- Models - HD - Adjustment - Pre-Treatment
+    sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
     \ # ---------- Models - HD - Adjustment - In-Treatment
-    sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \
-    \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \
-    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
@@ -250,10 +264,11 @@
     sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \
-    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
+    \ # ---------- Models - HD - Data
+    \ # ---------- Models - HD - Data - Pre-Treatment
+    sources/model/hd/data/MPreTreatmentDisposablePrimeData.cpp \
     sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \
-    sources/model/hd/data/MPreTreatmentPrimeData.cpp \
     \ # ---------- Models - HD - Data - States
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MPreTreatmentStatesData.cpp \
@@ -322,9 +337,9 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
+    sources/view/hd/data/VPreTreatmentDisposablePrimeData.cpp \
     sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \
-    sources/view/hd/data/VPreTreatmentPrimeData.cpp \
     \ # ---------- Views - HD - States Data
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/VPreTreatmentStatesData.cpp \