1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #5358

TriKriSta (1):
      fix: show the date every new day (fixes #5280)
This commit is contained in:
sudden6 2018-10-01 13:12:10 +02:00
commit ebbc0f2e72
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 2 additions and 2 deletions

View File

@ -814,7 +814,7 @@ void ChatForm::insertChatlines(QList<ChatLine::Ptr> chatLines)
verticalBar->setValue(savedSliderPos); verticalBar->setValue(savedSliderPos);
} }
QDate ChatForm::addDateLineIfNeeded(QList<ChatLine::Ptr> msgs, QDate const& lastDate, QDate ChatForm::addDateLineIfNeeded(QList<ChatLine::Ptr>& msgs, QDate const& lastDate,
History::HistMessage const& newMessage, History::HistMessage const& newMessage,
MessageMetadata const& metadata) MessageMetadata const& metadata)
{ {

View File

@ -128,7 +128,7 @@ private:
{} {}
}; };
void handleLoadedMessages(QList<History::HistMessage> newHistMsgs, bool processUndelivered); void handleLoadedMessages(QList<History::HistMessage> newHistMsgs, bool processUndelivered);
QDate addDateLineIfNeeded(QList<ChatLine::Ptr> msgs, QDate const& lastDate, QDate addDateLineIfNeeded(QList<ChatLine::Ptr>& msgs, QDate const& lastDate,
History::HistMessage const& newMessage, MessageMetadata const& metadata); History::HistMessage const& newMessage, MessageMetadata const& metadata);
MessageMetadata getMessageMetadata(History::HistMessage const& histMessage); MessageMetadata getMessageMetadata(History::HistMessage const& histMessage);
ChatMessage::Ptr chatMessageFromHistMessage(History::HistMessage const& histMessage, ChatMessage::Ptr chatMessageFromHistMessage(History::HistMessage const& histMessage,