Index: sources/ApplicationController.cpp
===================================================================
diff -u -rba15fce14caf76166c286da95974c69f8a24d4b8 -rd7f70405a20319dd9f2dc93ee7f357cc88d0f84b
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision ba15fce14caf76166c286da95974c69f8a24d4b8)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision d7f70405a20319dd9f2dc93ee7f357cc88d0f84b)
@@ -110,10 +110,7 @@
     connect(&_GuiController , SIGNAL(didTreatmentRangesDone(bool)),
             this            ,   SLOT( onTreatmentRangesDone(bool)));
 
-    // From HD/DG
-    connect(&_MessageDispatcher, SIGNAL(didActionReceive(GuiActionType, const QVariantList &)),
-            this               ,   SLOT( onActionReceive(GuiActionType, const QVariantList &)));
-
+    // From TD/DD
     connect(&_MessageDispatcher, SIGNAL(didFailedTransmit(Sequence)),
             this               ,   SLOT( onFailedTransmit(Sequence)));
 
@@ -206,18 +203,6 @@
 }
 
 /*!
- * \brief   An action has been confirmed
- * \details GUI requested an action.
- *          In response HD confirmed the action.
- * \param   vAction - Received action
- * \param   vData   - data of the action
- */
-void ApplicationController::onActionReceive (GuiActionType vAction, const QVariantList &vData)
-{
-    emit didActionReceive (vAction, vData);
-}
-
-/*!
  * \brief   ApplicationController::onMainTimerTimeout
  * \details This slot is called by MainTimer::didTimeout each second
  *          to call required methods like checkIn
@@ -353,8 +338,9 @@
     else {
         mData += static_cast<quint8>(GuiActionData::NoData);
     }
-// TODO ask behrouz what this method does ************************
-//    onActionTransmit(GuiActionType::ID_TDCheckIn, mData);
+
+    CheckIn data;
+    emit didAdjustment(data);
 #endif
 }
 
@@ -495,7 +481,7 @@
  */
 void ApplicationController::onSettingsUpdate()
 {
-    onActionReceive(SettingsData());
+    didActionReceive(SettingsData());
 
     /// POST ///
     //call initialization functions when setting's ready.
@@ -589,12 +575,31 @@
     static QVector<GuiAlarmID> failList;
     if ( vSend ) {
         if ( vSingle ) {
-            emit didActionTransmit(Gui::GuiActionType::ID_AlarmTriggered, {vAlarmID ,0,0,0,0,0,0,0});
+            AlarmTriggeredRequestData data;
+            data.mAlarmID          = vAlarmID;
+            data.mFieldDescriptor1 = 0;
+            data.mDataField1       = 0;
+            data.mFieldDescriptor2 = 0;
+            data.mDataField2       = 0;
+            data.mPriority         = 0;
+            data.mRank             = 0;
+            data.mClearTop         = 0;
+
+            emit didAdjustment(data);
         }
         else {
             for ( auto alarmID : failList ) {
-                //DEBUG qDebug()<< "sending POST fail alarm# "<< alarmID;
-                emit didActionTransmit(Gui::GuiActionType::ID_AlarmTriggered, {alarmID ,0,0,0,0,0,0,0});
+                AlarmTriggeredRequestData data;
+                data.mAlarmID          = alarmID;
+                data.mFieldDescriptor1 = 0;
+                data.mDataField1       = 0;
+                data.mFieldDescriptor2 = 0;
+                data.mDataField2       = 0;
+                data.mPriority         = 0;
+                data.mRank             = 0;
+                data.mClearTop         = 0;
+
+                emit didAdjustment(data);
             }
         }
     }