procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace QList with std::deque in notifications.

This commit is contained in:
John Preston 2019-04-18 13:04:14 +04:00
parent f3ed7a674a
commit 83306bb01f
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Telegram/SourceFiles/history/history.cpp
View File

@ -94,32 +94,31 @@ int History::height() const {
} }
void History::removeNotification(not_null<HistoryItem*> item) { void History::removeNotification(not_null<HistoryItem*> item) {
if (!notifies.isEmpty()) { _notifications.erase(
for (auto i = notifies.begin(), e = notifies.end(); i != e; ++i) { ranges::remove(_notifications, item),
if ((*i) == item) { end(_notifications));
notifies.erase(i);
break;
}
}
}
} }
HistoryItem *History::currentNotification() { HistoryItem *History::currentNotification() {
return notifies.isEmpty() ? 0 : notifies.front(); return empty(_notifications)
? nullptr
: _notifications.front().get();
} }
bool History::hasNotification() const { bool History::hasNotification() const {
return !notifies.isEmpty(); return !empty(_notifications);
} }
void History::skipNotification() { void History::skipNotification() {
if (!notifies.isEmpty()) { if (!empty(_notifications)) {
notifies.pop_front(); _notifications.pop_front();
} }
} }
void History::popNotification(HistoryItem *item) { void History::popNotification(HistoryItem *item) {
if (!notifies.isEmpty() && notifies.back() == item) notifies.pop_back(); if (!empty(_notifications) && (_notifications.back() == item)) {
_notifications.pop_back();
}
} }
bool History::hasPendingResizedItems() const { bool History::hasPendingResizedItems() const {
@ -1236,7 +1235,7 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
} }
} else if (item->unread()) { } else if (item->unread()) {
if (!isChannel() || peer->asChannel()->amIn()) { if (!isChannel() || peer->asChannel()->amIn()) {
notifies.push_back(item); _notifications.push_back(item);
App::main()->newUnreadMsg(this, item); App::main()->newUnreadMsg(this, item);
} }
} else { } else {
@ -2114,7 +2113,7 @@ void History::finishBuildingFrontBlock() {
} }
void History::clearNotifications() { void History::clearNotifications() {
notifies.clear(); _notifications.clear();
} }
bool History::loadedAtBottom() const { bool History::loadedAtBottom() const {
@ -3001,7 +3000,7 @@ void History::clear(ClearType type) {
lastKeyboardInited = false; lastKeyboardInited = false;
_loadedAtTop = _loadedAtBottom = false; _loadedAtTop = _loadedAtBottom = false;
} else { } else {
notifies.clear(); _notifications.clear();
owner().notifyHistoryCleared(this); owner().notifyHistoryCleared(this);
changeUnreadCount(-unreadCount()); changeUnreadCount(-unreadCount());
if (type == ClearType::DeleteChat) { if (type == ClearType::DeleteChat) {

5
Telegram/SourceFiles/history/history.h
View File

@ -335,9 +335,6 @@ public:
not_null<PeerData*> peer; not_null<PeerData*> peer;
typedef QList<HistoryItem*> NotifyQueue;
NotifyQueue notifies;
// we save the last showAtMsgId to restore the state when switching // we save the last showAtMsgId to restore the state when switching
// between different conversation histories // between different conversation histories
MsgId showAtMsgId = ShowAtUnreadMsgId; MsgId showAtMsgId = ShowAtUnreadMsgId;
@ -515,6 +512,8 @@ private:
Ui::SendActionAnimation _sendActionAnimation; Ui::SendActionAnimation _sendActionAnimation;
base::flat_map<SendAction::Type, crl::time> _mySendActions; base::flat_map<SendAction::Type, crl::time> _mySendActions;
std::deque<not_null<HistoryItem*>> _notifications;
std::weak_ptr<AdminLog::LocalIdManager> _adminLogIdManager; std::weak_ptr<AdminLog::LocalIdManager> _adminLogIdManager;
}; };