Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f -r08ffb068817ab0bb1c7f2fe2705986142ac68601 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) @@ -28,11 +28,11 @@ void VDateTime::initConnections() { startTimer(_timerInterval); - ACTION_VIEW_CONNECTION(AdjustHDDateTimeResponseData); - ACTION_VIEW_CONNECTION(AdjustDGDateTimeResponseData); + ACTION_VIEW_CONNECTION(AdjustTDDateTimeResponseData); + ACTION_VIEW_CONNECTION(AdjustDDDateTimeResponseData); ACTION_VIEW_CONNECTION(HDRTCEpochData); - ADJUST_VIEW_CONNECTION( AdjustHDDateTimeRequestData); - ADJUST_VIEW_CONNECTION( AdjustDGDateTimeRequestData); + ADJUST_VIEW_CONNECTION( AdjustTDDateTimeRequestData); + ADJUST_VIEW_CONNECTION( AdjustDDDateTimeRequestData); connect(&_process, SIGNAL( finished(int)), this, SLOT(onSetDateUIFinished(int))); @@ -112,8 +112,8 @@ status("Setting date and time ..."); dateTimeUI(dateTimeLocalStr, vNTP ); - dateTimeHD(epochUTC_sec ); // ??? TODO - dateTimeDG(epochUTC_sec ); // ??? TODO + dateTimeTD(epochUTC_sec ); // ??? TODO + dateTimeDD(epochUTC_sec ); // ??? TODO } /*! @@ -138,9 +138,9 @@ * \brief VDateTime::onActionReceive * Called when we receive a response back from the HD after requesting to * set the epoch - * \param vData (AdjustHDDateTimeResponseData) - the response data + * \param vData (AdjustTDDateTimeResponseData) - the response data */ -void VDateTime::onActionReceive(const AdjustHDDateTimeResponseData &vData) +void VDateTime::onActionReceive(const AdjustTDDateTimeResponseData &vData) { _acceptHD = vData.mAccepted ? SUCCEED : FAILED; _reasonHD = vData.mReason ; @@ -151,35 +151,35 @@ * \brief VDateTime::onActionReceive * Called when we receive a response back from the DG after requesting to * set the epoch - * \param vResponse (AdjustDGDateTimeResponseData) - the response + * \param vResponse (AdjustDDDateTimeResponseData) - the response */ -void VDateTime::onActionReceive(const AdjustDGDateTimeResponseData &vData) +void VDateTime::onActionReceive(const AdjustDDDateTimeResponseData &vData) { _acceptDG = vData.mAccepted ? SUCCEED : FAILED; _reasonDG = vData.mReason ; updateStatus(); } /*! - * \brief VDateTime::dateTimeHD - * \details Requests HD to set the date/time + * \brief VDateTime::dateTimeTD + * \details Requests TD to set the date/time * \param epoch - the epoch parameter which FW understands to set date/time */ -void VDateTime::dateTimeHD(quint32 epoch) +void VDateTime::dateTimeTD(quint32 epoch) { - AdjustHDDateTimeRequestData data; + AdjustTDDateTimeRequestData data; data.mEpoch = epoch; emit didAdjustment(data); } /*! - * \brief VDateTime::dateTimeDG + * \brief VDateTime::dateTimeDD * \details Requests DG to set the date/time * \param epoch - the epoch parameter which FW understands to set date/time */ -void VDateTime::dateTimeDG(quint32 epoch) +void VDateTime::dateTimeDD(quint32 epoch) { - AdjustDGDateTimeRequestData data; + AdjustDDDateTimeRequestData data; data.mEpoch = epoch; emit didAdjustment(data); }