Index: sources/view/hd/data/VHDTreatmentStatesData.cpp
===================================================================
diff -u -r2d2917978a4e25eb79a0fb71851b6124171d8072 -r13a086a989174b90594c7aa7cad69d12eab1d975
--- sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 2d2917978a4e25eb79a0fb71851b6124171d8072)
+++ sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 13a086a989174b90594c7aa7cad69d12eab1d975)
@@ -36,8 +36,6 @@
     // the one in the Adjustment messages should be removed since it is not sent on each state change
     // and will be sent only once to the request.
     ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData   );
-    ACTION_VIEW_CONNECTION(AdjustSalineResponseData                 );
-    ACTION_VIEW_CONNECTION(AdjustHeparinResponseData                );
 }
 
 /*!
@@ -55,8 +53,6 @@
     ufStart                 ( vData.mUFState            == GuiUFStates         ::UF_START_STATE                             );
     ufPaused                ( vData.mUFState            == GuiUFStates         ::UF_PAUSED_STATE                            );
     ufRunning               ( vData.mUFState            == GuiUFStates         ::UF_RUNNING_STATE                           );
-    ufOff                   ( vData.mUFState            == GuiUFStates         ::UF_OFF_STATE                               );
-    ufCompleted             ( vData.mUFState            == GuiUFStates         ::UF_COMPLETED_STATE                         );
 
     // Saline Bolus states
     sbIdle                  ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                    );
@@ -66,6 +62,7 @@
 
     // Heparin States
     hpOff                   ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_OFF                          );
+    hpStopped               ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_STOPPED                      );
     hpPaused                ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                       );
     hpInitial_bolus         ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS                );
     hpDispensing            ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                   );
@@ -145,36 +142,4 @@
     ufStart                 ( vData.mState          == GuiUFStates         ::UF_START_STATE                            );
     ufPaused                ( vData.mState          == GuiUFStates         ::UF_PAUSED_STATE                           );
     ufRunning               ( vData.mState          == GuiUFStates         ::UF_RUNNING_STATE                          );
-    ufOff                   ( vData.mState          == GuiUFStates         ::UF_OFF_STATE                              );
-    ufCompleted             ( vData.mState          == GuiUFStates         ::UF_COMPLETED_STATE                        );
 }
-
-/*!
- * \brief   VHDTreatmentStates::onActionReceive
- * \details message handler for the message AdjustSalineResponseData data
- * \param   vData - AdjustSalineResponseData data
- */
-void VHDTreatmentStates::onActionReceive(const AdjustSalineResponseData &vData)
-{
-    // Saline Bolus states
-    sbIdle                  ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                   );
-    sbWaitPump              ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    );
-    sbRunning               ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS            );
-    sbMaxReached            ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED          );
-}
-
-/*!
- * \brief   VHDTreatmentStates::onActionReceive
- * \details message handler for the message AdjustHeparinResponseData data
- * \param   vData - AdjustHeparinResponseData data
- */
-void VHDTreatmentStates::onActionReceive(const AdjustHeparinResponseData &vData)
-{
-    // Saline Bolus states
-    hpOff                   ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_OFF                         );
-    hpPaused                ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                      );
-    hpInitial_bolus         ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS               );
-    hpDispensing            ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                  );
-    hpCompleted             ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_COMPLETED                   );
-    hpEmpty                 ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_EMPTY                       );
-}