Index: sources/view/confirm/VConfirm.h
===================================================================
diff -u -rb9739918c71a21c181c8401f17ed05fb14996fec -re07cde120d7476c4add90c4f86cf55af9ea830de
--- sources/view/confirm/VConfirm.h	(.../VConfirm.h)	(revision b9739918c71a21c181c8401f17ed05fb14996fec)
+++ sources/view/confirm/VConfirm.h	(.../VConfirm.h)	(revision e07cde120d7476c4add90c4f86cf55af9ea830de)
@@ -20,7 +20,7 @@
 #include "main.h" // Doxygen : do not remove
 #include "VAdjustmentResponseBase.h"
 #include "MDuetConfirmTDi.h"
-#include "MAdjustPowerOff.h"
+#include "MTDPowerOffWarning.h"
 #include "MSettings.h"
 
 namespace View {
@@ -51,20 +51,16 @@
     const int dryDemoID = 99;
 
     // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each confirm message received. ********** //
-    READONLY( bool    , needConfirm     , false)
-
     // The property adjustment_Triggered has to be always true
     // and to always trigger the change event to work as a notifier for GUI
     TRIGGER ( bool      , adjustment    , 0)
+    TRIGGER ( bool      , powerOff      , 0)
 
     PROPERTY(quint32    , id            , 0)
     PROPERTY(quint32    , command       , 0)
 
-    TRIGGER( quint8     , poweroff      , 0)
-    PROPERTY(bool       , isPowerOff    , 0)
-
     PROPERTY(bool       , isTimeout     , 0)
-    PROPERTY(bool       , isReject      , 0)
+    TRIGGER (bool       , isReject      , 0)
     PROPERTY(bool       , isAccept      , 0)
 
     TRIGGER (bool       , visible       , 0)
@@ -77,10 +73,6 @@
     void setConfirmCommand  (const DuetConfirmTDiData &vData);
     void setConfirmId       (const DuetConfirmTDiData &vData);
 
-    void setPowerOffCommand ();
-    void setPowerOffId      ();
-
-
     VIEW_DEC_CLASS  (VConfirm              )
     VIEW_DEC_SLOT   (DuetConfirmTDiData    )
     VIEW_DEC_SLOT   (PowerOffData          )