mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-18 20:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test

Browse source
This commit is contained in:
Julien Wadel 2022-12-05 09:06:06 +01:00
parent 69db42de04
commit 2b14e79225
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp
View file

@ -143,7 +143,7 @@ std::shared_ptr<linphone::ConferenceInfo> 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();
}

10
linphone-app/src/components/other/date/LDateTime.cpp
View file

@ -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)){