From 3d30ed65f9e226b7b183b23ce5dba435ec491f0b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 10 Jan 2025 18:28:28 +0300 Subject: DBEVENTINFO::timestamp to become 64-bit integer --- plugins/HistoryStats/src/mirandacontact.cpp | 26 +++++++++++++------------- plugins/HistoryStats/src/statistic.cpp | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/mirandacontact.cpp b/plugins/HistoryStats/src/mirandacontact.cpp index f0e20dcc76..cd666d9419 100644 --- a/plugins/HistoryStats/src/mirandacontact.cpp +++ b/plugins/HistoryStats/src/mirandacontact.cpp @@ -162,14 +162,14 @@ void MirandaContactTolerantMerge::fillQueue() // assume that items with +/- 30 seconds may be equal static const int timestampTol = 30; - while (!m_CIs.empty() && (m_EIs.size() < 2 || (m_EIs.back().dbe.timestamp - m_EIs.front().dbe.timestamp) <= timestampTol)) { + while (!m_CIs.empty() && (m_EIs.size() < 2 || (m_EIs.back().dbe.getUnixtime() - m_EIs.front().dbe.getUnixtime()) <= timestampTol)) { // find oldest next event in chains int nNext = 0; - uint32_t timestampFirst = m_CIs.front().ei.dbe.timestamp; + uint32_t timestampFirst = m_CIs.front().ei.dbe.getUnixtime(); for (int i = 1; i < m_CIs.size(); ++i) { - if (m_CIs[i].ei.dbe.timestamp < timestampFirst) { - timestampFirst = m_CIs[i].ei.dbe.timestamp; + if (m_CIs[i].ei.dbe.getUnixtime() < timestampFirst) { + timestampFirst = m_CIs[i].ei.dbe.getUnixtime(); nNext = i; } } @@ -183,7 +183,7 @@ void MirandaContactTolerantMerge::fillQueue() iter_each_(std::list, j, m_EIs) { EventInfo& j_ei = *j; - int timestampDelta = j_ei.dbe.timestamp - ci.ei.dbe.timestamp; + int timestampDelta = j_ei.dbe.getUnixtime() - ci.ei.dbe.getUnixtime(); if (timestampDelta > 0) { insPos = j; @@ -227,14 +227,14 @@ void MirandaContactStrictMerge::fillQueue() // assume that items with +/- 30 seconds may be equal static const int timestampTol = 0; - while (!m_CIs.empty() && (m_EIs.size() < 2 || (m_EIs.back().dbe.timestamp - m_EIs.front().dbe.timestamp) <= timestampTol)) { + while (!m_CIs.empty() && (m_EIs.size() < 2 || (m_EIs.back().dbe.getUnixtime() - m_EIs.front().dbe.getUnixtime()) <= timestampTol)) { // find oldest next event in chains int nNext = 0; - uint32_t timestampFirst = m_CIs.front().ei.dbe.timestamp; + uint32_t timestampFirst = m_CIs.front().ei.dbe.getUnixtime(); for (int i = 1; i < m_CIs.size(); ++i) { - if (m_CIs[i].ei.dbe.timestamp < timestampFirst) { - timestampFirst = m_CIs[i].ei.dbe.timestamp; + if (m_CIs[i].ei.dbe.getUnixtime() < timestampFirst) { + timestampFirst = m_CIs[i].ei.dbe.getUnixtime(); nNext = i; } } @@ -248,7 +248,7 @@ void MirandaContactStrictMerge::fillQueue() iter_each_(std::list, j, m_EIs) { EventInfo& j_ei = *j; - int timestampDelta = j_ei.dbe.timestamp - ci.ei.dbe.timestamp; + int timestampDelta = j_ei.dbe.getUnixtime() - ci.ei.dbe.getUnixtime(); if (timestampDelta > 0) insPos = j; @@ -291,11 +291,11 @@ void MirandaContactNoMerge::fillQueue() while (!m_CIs.empty() && m_EIs.size() < 1) { // find oldest next event in chains int nNext = 0; - uint32_t timestampFirst = m_CIs.front().ei.dbe.timestamp; + uint32_t timestampFirst = m_CIs.front().ei.dbe.getUnixtime(); for (int i = 1; i < m_CIs.size(); ++i) { - if (m_CIs[i].ei.dbe.timestamp < timestampFirst) { - timestampFirst = m_CIs[i].ei.dbe.timestamp; + if (m_CIs[i].ei.dbe.getUnixtime() < timestampFirst) { + timestampFirst = m_CIs[i].ei.dbe.getUnixtime(); nNext = i; } } diff --git a/plugins/HistoryStats/src/statistic.cpp b/plugins/HistoryStats/src/statistic.cpp index 37da089c20..f3cbb0a4d9 100644 --- a/plugins/HistoryStats/src/statistic.cpp +++ b/plugins/HistoryStats/src/statistic.cpp @@ -407,7 +407,7 @@ bool Statistic::stepReadDB() // filter logged status messages from tabSRMM if (dbei.eventType == etMessage) { // convert to local time (everything in this plugin is done in local time) - uint32_t localTimestamp = TimeZone_ToLocal(dbei.timestamp); + uint32_t localTimestamp = TimeZone_ToLocal(dbei.getUnixtime()); if (localTimestamp >= m_TimeMin && localTimestamp <= m_TimeMax) { if (dbei.flags & DBEF_UTF) { -- cgit v1.2.3