From 2b14e79225aa80ebf19fa8a57eba2de42b7a58b9 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 5 Dec 2022 09:06:06 +0100 Subject: [PATCH] test --- .../components/conferenceInfo/ConferenceInfoModel.cpp | 5 +++-- linphone-app/src/components/other/date/LDateTime.cpp | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp index 0a8adb8b9..25d9aa077 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp @@ -143,7 +143,7 @@ std::shared_ptr ConferenceInfoModel::findConferenceInf //Note conferenceInfo->getDateTime uses system timezone. QDateTime ConferenceInfoModel::getDateTimeUtc() const{ - return QDateTime::fromMSecsSinceEpoch(mConferenceInfo->getDateTime() * 1000).toUTC(); + return QDateTime::fromMSecsSinceEpoch(mConferenceInfo->getDateTime() * 1000);//.toUTC(); } QDateTime ConferenceInfoModel::getDateTimeSystem() const{ @@ -234,7 +234,8 @@ LinphoneEnums::ConferenceSchedulerState ConferenceInfoModel::getConferenceSchedu void ConferenceInfoModel::setDateTime(const QDateTime& dateTime){ QDateTime utc = dateTime.addSecs( -mTimeZone.offsetFromUtc(dateTime)); QDateTime system = utc.addSecs(QTimeZone::systemTimeZone().offsetFromUtc(utc)); - mConferenceInfo->setDateTime(system.toMSecsSinceEpoch() / 1000); + qWarning() << dateTime.toMSecsSinceEpoch() << "/" << utc.toMSecsSinceEpoch() << "/" << system.toMSecsSinceEpoch(); + mConferenceInfo->setDateTime(utc.toMSecsSinceEpoch() / 1000); emit dateTimeChanged(); } diff --git a/linphone-app/src/components/other/date/LDateTime.cpp b/linphone-app/src/components/other/date/LDateTime.cpp index 3942a42d9..1906ba4e3 100644 --- a/linphone-app/src/components/other/date/LDateTime.cpp +++ b/linphone-app/src/components/other/date/LDateTime.cpp @@ -34,7 +34,15 @@ LDateTime::LDateTime(const QDateTime& dateTime, QObject *parent) : QObject(paren , mDateTime(dateTime){ } LDateTime::LDateTime(LDate * date, LTime * time, QObject *parent) : QObject(parent) - , mDateTime(date->getDate(), time->getTime(), Qt::OffsetFromUTC ){ + , mDateTime(date->getDate(), time->getTime(), Qt::UTC ){ + + QDateTime a(date->getDate(), time->getTime()); + QDateTime b(date->getDate(), time->getTime(), Qt::OffsetFromUTC); + qWarning() << time->toTimeString("hh:mm") << "/" << mDateTime.time().toString("hh:mm:") << mDateTime.toString("hh:mm") << "/" << mDateTime.toMSecsSinceEpoch() + << " == " << a.time().toString("hh:mm") << "/" << a.toString("hh:mm")<< "/" << a.toMSecsSinceEpoch() + << " == " << b.time().toString("hh:mm") << "/" << b.toString("hh:mm")<< "/" << b.toMSecsSinceEpoch() + ; + } LDateTime::LDateTime(const int& year, const int& month, const int& day, const int& hour, const int& minute, const int& second, QObject *parent) : QObject(parent) , mDateTime(QDate(year, month, day), QTime(hour, minute, second)){