ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some deprecation.

Browse Source
This commit is contained in:
Black
2020-07-28 20:33:32 -07:00
parent 675ec40a63
commit d6009479a5
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/matriximageprovider.h
View File

@@ -56,7 +56,7 @@ class MatrixImageProvider : public QObject, public QQuickAsyncImageProvider {
Quotient::Connection* connection() { return m_connection; } Quotient::Connection* connection() { return m_connection; }
void setConnection(Quotient::Connection* connection) { void setConnection(Quotient::Connection* connection) {
m_connection.store(connection); m_connection.storeRelaxed(connection);
emit connectionChanged(); emit connectionChanged();
} }

11
src/messageeventmodel.cpp
View File

@@ -207,13 +207,13 @@ int MessageEventModel::refreshEventRoles(const QString& id,
} }
inline bool hasValidTimestamp(const Quotient::TimelineItem& ti) { inline bool hasValidTimestamp(const Quotient::TimelineItem& ti) {
return ti->timestamp().isValid(); return ti->originTimestamp().isValid();
} }
QDateTime MessageEventModel::makeMessageTimestamp( QDateTime MessageEventModel::makeMessageTimestamp(
const Quotient::Room::rev_iter_t& baseIt) const { const Quotient::Room::rev_iter_t& baseIt) const {
const auto& timeline = m_currentRoom->messageEvents(); const auto& timeline = m_currentRoom->messageEvents();
auto ts = baseIt->event()->timestamp(); auto ts = baseIt->event()->originTimestamp();
if (ts.isValid()) if (ts.isValid())
return ts; return ts;
@@ -222,10 +222,10 @@ QDateTime MessageEventModel::makeMessageTimestamp(
using Quotient::TimelineItem; using Quotient::TimelineItem;
auto rit = std::find_if(baseIt, timeline.rend(), hasValidTimestamp); auto rit = std::find_if(baseIt, timeline.rend(), hasValidTimestamp);
if (rit != timeline.rend()) if (rit != timeline.rend())
return {rit->event()->timestamp().date(), {0, 0}, Qt::LocalTime}; return {rit->event()->originTimestamp().date(), {0, 0}, Qt::LocalTime};
auto it = std::find_if(baseIt.base(), timeline.end(), hasValidTimestamp); auto it = std::find_if(baseIt.base(), timeline.end(), hasValidTimestamp);
if (it != timeline.end()) if (it != timeline.end())
return {it->event()->timestamp().date(), {0, 0}, Qt::LocalTime}; return {it->event()->originTimestamp().date(), {0, 0}, Qt::LocalTime};
// What kind of room is that?.. // What kind of room is that?..
qCritical() << "No valid timestamps in the room timeline!"; qCritical() << "No valid timestamps in the room timeline!";
@@ -242,7 +242,8 @@ QString MessageEventModel::renderDate(QDateTime timestamp) const {
return tr("The day before yesterday"); return tr("The day before yesterday");
if (date > QDate::currentDate().addDays(-7)) if (date > QDate::currentDate().addDays(-7))
return date.toString("dddd"); return date.toString("dddd");
return date.toString(Qt::DefaultLocaleShortDate);
return QLocale::system().toString(date, QLocale::ShortFormat);
} }
void MessageEventModel::refreshLastUserEvents(int baseTimelineRow) { void MessageEventModel::refreshLastUserEvents(int baseTimelineRow) {

2
src/spectralroom.cpp
View File

@@ -167,7 +167,7 @@ void SpectralRoom::countChanged() {
QDateTime SpectralRoom::lastActiveTime() const { QDateTime SpectralRoom::lastActiveTime() const {
if (timelineSize() == 0) if (timelineSize() == 0)
return QDateTime(); return QDateTime();
return messageEvents().rbegin()->get()->timestamp(); return messageEvents().rbegin()->get()->originTimestamp();
} }
int SpectralRoom::savedTopVisibleIndex() const { int SpectralRoom::savedTopVisibleIndex() const {