Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -r7d9128b49d1f7d6f36fd35286adda8c95441c552 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 7d9128b49d1f7d6f36fd35286adda8c95441c552) @@ -59,8 +59,8 @@ */ void VDateTime::doInit() { - _acceptHD = NOT_SET; - _acceptDG = NOT_SET; + _acceptTD = NOT_SET; + _acceptDD = NOT_SET; _acceptUI = NOT_SET; QDateTime _currentTime = QDateTime::currentDateTime(); hour (_currentTime.toString("HH" )); @@ -112,8 +112,8 @@ status("Setting date and time ..."); dateTimeUI(dateTimeLocalStr, vNTP ); - dateTimeTD(epochUTC_sec ); // ??? TODO - dateTimeDD(epochUTC_sec ); // ??? TODO + dateTimeTD(epochUTC_sec ); + dateTimeDD(epochUTC_sec ); } /*! @@ -142,8 +142,8 @@ */ void VDateTime::onActionReceive(const AdjustTDDateTimeResponseData &vData) { - _acceptHD = vData.mAccepted ? SUCCEED : FAILED; - _reasonHD = vData.mReason ; + _acceptTD = vData.mAccepted ? SUCCEED : FAILED; + _reasonTD = vData.mReason ; updateStatus(); } @@ -155,8 +155,8 @@ */ void VDateTime::onActionReceive(const AdjustDDDateTimeResponseData &vData) { - _acceptDG = vData.mAccepted ? SUCCEED : FAILED; - _reasonDG = vData.mReason ; + _acceptDD = vData.mAccepted ? SUCCEED : FAILED; + _reasonDD = vData.mReason ; updateStatus(); } @@ -228,9 +228,9 @@ */ void VDateTime::updateStatus() { - status(QString("HD: %1, DG: %2, UI: %3") - .arg(status(_acceptHD, _reasonHD)) - .arg(status(_acceptDG, _reasonDG)) + status(QString("TD: %1, DD: %2, UI: %3") + .arg(status(_acceptTD, _reasonTD)) + .arg(status(_acceptDD, _reasonDD)) .arg(status(_acceptUI, _reasonUI)) ); } Index: sources/view/settings/VDateTime.h =================================================================== diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -r7d9128b49d1f7d6f36fd35286adda8c95441c552 --- sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 7d9128b49d1f7d6f36fd35286adda8c95441c552) @@ -69,11 +69,11 @@ QProcess _process ; QString _updateFormat = "yyyy-MM-dd HH:mm:ss"; // format only used for changing system date/ time - DateTimeSetStatus _acceptHD = NOT_SET; - DateTimeSetStatus _acceptDG = NOT_SET; + DateTimeSetStatus _acceptTD = NOT_SET; + DateTimeSetStatus _acceptDD = NOT_SET; DateTimeSetStatus _acceptUI = NOT_SET; - quint8 _reasonHD = 0; - quint8 _reasonDG = 0; + quint8 _reasonTD = 0; + quint8 _reasonDD = 0; quint8 _reasonUI = 0; void dateTimeTD(quint32 epoch);