diff --git a/src/AvatarProvider.cc b/src/AvatarProvider.cc
index 881ef2d5..f39d9870 100644
--- a/src/AvatarProvider.cc
+++ b/src/AvatarProvider.cc
@@ -20,8 +20,8 @@
QSharedPointer<MatrixClient> AvatarProvider::client_;
-QMap<QString, AvatarData> AvatarProvider::avatars_;
-QMap<QString, QList<std::function<void(QImage)>>> AvatarProvider::toBeResolved_;
+std::map<QString, AvatarData> AvatarProvider::avatars_;
+std::map<QString, std::vector<std::function<void(QImage)>>> AvatarProvider::toBeResolved_;
void
AvatarProvider::init(QSharedPointer<MatrixClient> client)
@@ -32,26 +32,26 @@ AvatarProvider::init(QSharedPointer<MatrixClient> client)
void
AvatarProvider::updateAvatar(const QString &uid, const QImage &img)
{
- if (toBeResolved_.contains(uid)) {
+ if (toBeResolved_.find(uid) != toBeResolved_.end()) {
auto callbacks = toBeResolved_[uid];
// Update all the timeline items with the resolved avatar.
for (const auto callback : callbacks)
callback(img);
- toBeResolved_.remove(uid);
+ toBeResolved_.erase(toBeResolved_.find(uid));
}
auto avatarData = avatars_[uid];
avatarData.img = img;
- avatars_.insert(uid, avatarData);
+ avatars_.emplace(uid, avatarData);
}
void
AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callback)
{
- if (!avatars_.contains(userId))
+ if (avatars_.find(userId) == avatars_.end())
return;
auto img = avatars_[userId].img;
@@ -62,7 +62,7 @@ AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callb
}
// Add the current timeline item to the waiting list for this avatar.
- if (!toBeResolved_.contains(userId)) {
+ if (toBeResolved_.find(userId) == toBeResolved_.end()) {
client_->fetchUserAvatar(avatars_[userId].url,
[userId](QImage image) { updateAvatar(userId, image); },
[userId](QString error) {
@@ -71,12 +71,12 @@ AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callb
<< userId;
});
- QList<std::function<void(QImage)>> items;
- items.push_back(callback);
+ std::vector<std::function<void(QImage)>> items;
+ items.emplace_back(callback);
- toBeResolved_.insert(userId, items);
+ toBeResolved_.emplace(userId, items);
} else {
- toBeResolved_[userId].push_back(callback);
+ toBeResolved_[userId].emplace_back(callback);
}
}
@@ -86,7 +86,7 @@ AvatarProvider::setAvatarUrl(const QString &userId, const QUrl &url)
AvatarData data;
data.url = url;
- avatars_.insert(userId, data);
+ avatars_.emplace(userId, data);
}
void
diff --git a/src/Cache.cc b/src/Cache.cc
index 32176369..d889f731 100644
--- a/src/Cache.cc
+++ b/src/Cache.cc
@@ -155,7 +155,7 @@ Cache::image(const QString &url) const
void
Cache::setState(const QString &nextBatchToken,
- const QMap<QString, QSharedPointer<RoomState>> &states)
+ const std::map<QString, QSharedPointer<RoomState>> &states)
{
if (!isMounted_)
return;
@@ -165,8 +165,8 @@ Cache::setState(const QString &nextBatchToken,
setNextBatchToken(txn, nextBatchToken);
- for (auto it = states.constBegin(); it != states.constEnd(); ++it)
- insertRoomState(txn, it.key(), it.value());
+ for (auto const &state : states)
+ insertRoomState(txn, state.first, state.second);
txn.commit();
} catch (const lmdb::error &e) {
@@ -252,7 +252,7 @@ Cache::removeInvite(const QString &room_id)
void
Cache::states()
{
- QMap<QString, RoomState> states;
+ std::map<QString, RoomState> states;
auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY);
auto cursor = lmdb::cursor::open(txn, roomDb_);
@@ -293,7 +293,7 @@ Cache::states()
qDebug() << members.size() << "members for" << roomid;
state.memberships = members;
- states.insert(roomid, state);
+ states.emplace(roomid, std::move(state));
}
qDebug() << "Retrieved" << states.size() << "rooms";
diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index 225434e6..6d9c87f2 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -161,7 +161,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
return;
}
- if (typingUsers_.contains(roomid))
+ if (typingUsers_.find(roomid) != typingUsers_.end())
users = typingUsers_[roomid];
typingDisplay_->setUsers(users);
@@ -185,7 +185,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
&TimelineViewManager::unreadMessages,
this,
[=](const QString &roomid, int count) {
- if (!roomSettings_.contains(roomid)) {
+ if (roomSettings_.find(roomid) == roomSettings_.end()) {
qWarning() << "RoomId does not have settings" << roomid;
room_list_->updateUnreadMessageCount(roomid, count);
return;
@@ -331,20 +331,20 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
&MatrixClient::communityProfileRetrieved,
this,
[=](QString communityId, QJsonObject profile) {
- communityManager_[communityId]->parseProfile(profile);
+ communities_[communityId]->parseProfile(profile);
});
connect(client_.data(),
&MatrixClient::communityRoomsRetrieved,
this,
[=](QString communityId, QJsonObject rooms) {
- communityManager_[communityId]->parseRooms(rooms);
+ communities_[communityId]->parseRooms(rooms);
if (communityId == current_community_) {
if (communityId == "world") {
room_list_->setFilterRooms(false);
} else {
room_list_->setRoomFilter(
- communityManager_[communityId]->getRoomList());
+ communities_[communityId]->getRoomList());
}
}
});
@@ -394,12 +394,11 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
this,
[=](const QString &communityId) {
current_community_ = communityId;
- if (communityId == "world") {
+
+ if (communityId == "world")
room_list_->setFilterRooms(false);
- } else {
- room_list_->setRoomFilter(
- communityManager_[communityId]->getRoomList());
- }
+ else
+ room_list_->setRoomFilter(communities_[communityId]->getRoomList());
});
setGroupViewState(userSettings_->isGroupViewEnabled());
@@ -427,7 +426,7 @@ ChatPage::logout()
void
ChatPage::resetUI()
{
- room_avatars_.clear();
+ roomAvatars_.clear();
room_list_->clear();
roomSettings_.clear();
roomStates_.clear();
@@ -538,9 +537,9 @@ ChatPage::initialSyncCompleted(const mtx::responses::Sync &response)
const auto room_id = QString::fromStdString(it->first);
- roomStates_.insert(room_id, roomState);
- roomSettings_.insert(room_id,
- QSharedPointer<RoomSettings>(new RoomSettings(room_id)));
+ roomStates_.emplace(room_id, roomState);
+ roomSettings_.emplace(room_id,
+ QSharedPointer<RoomSettings>(new RoomSettings(room_id)));
for (const auto membership : roomState->memberships) {
updateUserDisplayName(membership.second);
@@ -572,7 +571,7 @@ ChatPage::initialSyncCompleted(const mtx::responses::Sync &response)
void
ChatPage::updateTopBarAvatar(const QString &roomid, const QPixmap &img)
{
- room_avatars_.insert(roomid, img);
+ roomAvatars_.emplace(roomid, img);
if (current_room_ != roomid)
return;
@@ -602,16 +601,16 @@ ChatPage::updateOwnCommunitiesInfo(const QList<QString> &own_communities)
for (int i = 0; i < own_communities.size(); i++) {
QSharedPointer<Community> community = QSharedPointer<Community>(new Community());
- communityManager_[own_communities[i]] = community;
+ communities_[own_communities[i]] = community;
}
- communitiesList_->setCommunities(communityManager_);
+ communitiesList_->setCommunities(communities_);
}
void
ChatPage::changeTopRoomInfo(const QString &room_id)
{
- if (!roomStates_.contains(room_id))
+ if (roomStates_.find(room_id) == roomStates_.end())
return;
auto state = roomStates_[room_id];
@@ -620,8 +619,8 @@ ChatPage::changeTopRoomInfo(const QString &room_id)
top_bar_->updateRoomTopic(state->getTopic());
top_bar_->setRoomSettings(roomSettings_[room_id]);
- if (room_avatars_.contains(room_id))
- top_bar_->updateRoomAvatar(room_avatars_.value(room_id).toImage());
+ if (roomAvatars_.find(room_id) != roomAvatars_.end())
+ top_bar_->updateRoomAvatar(roomAvatars_[room_id].toImage());
else
top_bar_->updateRoomAvatarFromName(state->getName());
@@ -648,51 +647,56 @@ ChatPage::loadStateFromCache()
qDebug() << "Restored nextBatchToken" << cache_->nextBatchToken();
client_->setNextBatchToken(cache_->nextBatchToken());
- qRegisterMetaType<QMap<QString, RoomState>>();
+ qRegisterMetaType<std::map<QString, RoomState>>();
QtConcurrent::run(cache_.data(), &Cache::states);
- connect(cache_.data(), &Cache::statesLoaded, this, [this](QMap<QString, RoomState> rooms) {
- qDebug() << "Cache data loaded";
+ connect(
+ cache_.data(), &Cache::statesLoaded, this, [this](std::map<QString, RoomState> rooms) {
+ qDebug() << "Cache data loaded";
- for (auto it = rooms.constBegin(); it != rooms.constEnd(); ++it) {
- auto roomState = QSharedPointer<RoomState>(new RoomState(it.value()));
+ std::vector<QString> roomKeys;
- // Clean up and prepare state for use.
- roomState->removeLeaveMemberships();
- roomState->resolveName();
- roomState->resolveAvatar();
+ for (auto const &room : rooms) {
+ auto roomState = QSharedPointer<RoomState>(new RoomState(room.second));
- // Save the current room state.
- roomStates_.insert(it.key(), roomState);
+ // Clean up and prepare state for use.
+ roomState->removeLeaveMemberships();
+ roomState->resolveName();
+ roomState->resolveAvatar();
- // Create or restore the settings for this room.
- roomSettings_.insert(
- it.key(), QSharedPointer<RoomSettings>(new RoomSettings(it.key())));
+ // Save the current room state.
+ roomStates_.emplace(room.first, roomState);
- // Resolve user avatars.
- for (const auto membership : roomState->memberships) {
- updateUserDisplayName(membership.second);
- updateUserAvatarUrl(membership.second);
- }
- }
+ // Create or restore the settings for this room.
+ roomSettings_.emplace(
+ room.first, QSharedPointer<RoomSettings>(new RoomSettings(room.first)));
- // Initializing empty timelines.
- view_manager_->initialize(rooms.keys());
+ // Resolve user avatars.
+ for (auto const &membership : roomState->memberships) {
+ updateUserDisplayName(membership.second);
+ updateUserAvatarUrl(membership.second);
+ }
- // Initialize room list from the restored state and settings.
- room_list_->setInitialRooms(roomSettings_, roomStates_);
- room_list_->syncInvites(cache_->invites());
+ roomKeys.emplace_back(room.first);
+ }
- // Check periodically if the timelines have been loaded.
- consensusTimer_->start(CONSENSUS_TIMEOUT);
+ // Initializing empty timelines.
+ view_manager_->initialize(roomKeys);
- // Show the content if consensus can't be achieved.
- showContentTimer_->start(SHOW_CONTENT_TIMEOUT);
+ // Initialize room list from the restored state and settings.
+ room_list_->setInitialRooms(roomSettings_, roomStates_);
+ room_list_->syncInvites(cache_->invites());
- // Start receiving events.
- client_->sync();
- });
+ // Check periodically if the timelines have been loaded.
+ consensusTimer_->start(CONSENSUS_TIMEOUT);
+
+ // Show the content if consensus can't be achieved.
+ showContentTimer_->start(SHOW_CONTENT_TIMEOUT);
+
+ // Start receiving events.
+ client_->sync();
+ });
}
void
@@ -723,14 +727,14 @@ ChatPage::showQuickSwitcher()
quickSwitcherModal_->setColor(QColor(30, 30, 30, 170));
}
- QMap<QString, QString> rooms;
+ std::map<QString, QString> rooms;
- for (auto it = roomStates_.constBegin(); it != roomStates_.constEnd(); ++it) {
+ for (auto const &state : roomStates_) {
QString deambiguator =
- QString::fromStdString(it.value()->canonical_alias.content.alias);
+ QString::fromStdString(state.second->canonical_alias.content.alias);
if (deambiguator == "")
- deambiguator = it.key();
- rooms.insert(it.value()->getName() + " (" + deambiguator + ")", it.key());
+ deambiguator = state.first;
+ rooms.emplace(state.second->getName() + " (" + deambiguator + ")", state.first);
}
quickSwitcher_->setRoomList(rooms);
@@ -740,14 +744,14 @@ ChatPage::showQuickSwitcher()
void
ChatPage::addRoom(const QString &room_id)
{
- if (!roomStates_.contains(room_id)) {
+ if (roomStates_.find(room_id) == roomStates_.end()) {
auto room_state = QSharedPointer<RoomState>(new RoomState);
- roomStates_.insert(room_id, room_state);
- roomSettings_.insert(room_id,
- QSharedPointer<RoomSettings>(new RoomSettings(room_id)));
+ roomStates_.emplace(room_id, room_state);
+ roomSettings_.emplace(room_id,
+ QSharedPointer<RoomSettings>(new RoomSettings(room_id)));
- room_list_->addRoom(roomSettings_, roomStates_[room_id], room_id);
+ room_list_->addRoom(roomSettings_[room_id], roomStates_[room_id], room_id);
room_list_->highlightSelectedRoom(room_id);
changeTopRoomInfo(room_id);
@@ -757,8 +761,8 @@ ChatPage::addRoom(const QString &room_id)
void
ChatPage::removeRoom(const QString &room_id)
{
- roomStates_.remove(room_id);
- roomSettings_.remove(room_id);
+ roomStates_.erase(roomStates_.find(room_id));
+ roomSettings_.erase(roomSettings_.find(room_id));
try {
cache_->removeRoom(room_id);
cache_->removeInvite(room_id);
@@ -812,7 +816,7 @@ ChatPage::updateTypingUsers(const QString &roomid, const std::vector<std::string
typingDisplay_->setUsers(users);
}
- typingUsers_.insert(roomid, users);
+ typingUsers_.emplace(roomid, users);
}
void
@@ -833,7 +837,7 @@ ChatPage::updateUserDisplayName(
auto stateKey = QString::fromStdString(membership.state_key);
if (!displayName.isEmpty())
- TimelineViewManager::DISPLAY_NAMES.insert(stateKey, displayName);
+ TimelineViewManager::DISPLAY_NAMES.emplace(stateKey, displayName);
}
void
@@ -842,7 +846,7 @@ ChatPage::removeLeftRooms(const std::map<std::string, mtx::responses::LeftRoom>
for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) {
const auto room_id = QString::fromStdString(it->first);
- if (roomStates_.contains(room_id))
+ if (roomStates_.find(room_id) != roomStates_.end())
removeRoom(room_id);
}
}
@@ -865,7 +869,7 @@ ChatPage::updateJoinedRooms(const std::map<std::string, mtx::responses::JoinedRo
const auto newTimelineEvents = it->second.timeline;
// Merge the new updates for rooms that we are tracking.
- if (roomStates_.contains(roomid)) {
+ if (roomStates_.find(roomid) != roomStates_.end()) {
auto oldState = roomStates_[roomid];
oldState->updateFromEvents(newStateEvents.events);
oldState->updateFromEvents(newTimelineEvents.events);
@@ -881,9 +885,9 @@ ChatPage::updateJoinedRooms(const std::map<std::string, mtx::responses::JoinedRo
roomState->resolveName();
roomState->resolveAvatar();
- roomStates_.insert(roomid, roomState);
+ roomStates_.emplace(roomid, roomState);
- roomSettings_.insert(
+ roomSettings_.emplace(
roomid, QSharedPointer<RoomSettings>(new RoomSettings(roomid)));
view_manager_->addRoom(it->second, roomid);
@@ -899,17 +903,17 @@ ChatPage::updateJoinedRooms(const std::map<std::string, mtx::responses::JoinedRo
}
}
-QMap<QString, QSharedPointer<RoomState>>
+std::map<QString, QSharedPointer<RoomState>>
ChatPage::generateMembershipDifference(
const std::map<std::string, mtx::responses::JoinedRoom> &rooms,
- const QMap<QString, QSharedPointer<RoomState>> &states) const
+ const std::map<QString, QSharedPointer<RoomState>> &states) const
{
- QMap<QString, QSharedPointer<RoomState>> stateDiff;
+ std::map<QString, QSharedPointer<RoomState>> stateDiff;
for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) {
const auto room_id = QString::fromStdString(it->first);
- if (!states.contains(room_id))
+ if (states.find(room_id) == states.end())
continue;
auto all_memberships = getMemberships(it->second.state.events);
@@ -920,17 +924,17 @@ ChatPage::generateMembershipDifference(
all_memberships.emplace(mm->first, mm->second);
auto local = QSharedPointer<RoomState>(new RoomState);
- local->aliases = states[room_id]->aliases;
- local->avatar = states[room_id]->avatar;
- local->canonical_alias = states[room_id]->canonical_alias;
- local->history_visibility = states[room_id]->history_visibility;
- local->join_rules = states[room_id]->join_rules;
- local->name = states[room_id]->name;
- local->power_levels = states[room_id]->power_levels;
- local->topic = states[room_id]->topic;
+ local->aliases = states.at(room_id)->aliases;
+ local->avatar = states.at(room_id)->avatar;
+ local->canonical_alias = states.at(room_id)->canonical_alias;
+ local->history_visibility = states.at(room_id)->history_visibility;
+ local->join_rules = states.at(room_id)->join_rules;
+ local->name = states.at(room_id)->name;
+ local->power_levels = states.at(room_id)->power_levels;
+ local->topic = states.at(room_id)->topic;
local->memberships = all_memberships;
- stateDiff.insert(room_id, local);
+ stateDiff.emplace(room_id, local);
}
return stateDiff;
diff --git a/src/CommunitiesList.cc b/src/CommunitiesList.cc
index c40155e5..1469dd87 100644
--- a/src/CommunitiesList.cc
+++ b/src/CommunitiesList.cc
@@ -34,7 +34,7 @@ CommunitiesList::CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *p
WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
contentsLayout_->addWidget(world_list_item);
- communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item));
+ communities_.emplace("world", QSharedPointer<CommunitiesListItem>(world_list_item));
connect(world_list_item,
&WorldCommunityListItem::clicked,
this,
@@ -57,30 +57,25 @@ CommunitiesList::CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *p
SLOT(updateCommunityAvatar(const QString &, const QPixmap &)));
}
-CommunitiesList::~CommunitiesList() {}
-
void
-CommunitiesList::setCommunities(const QMap<QString, QSharedPointer<Community>> &communities)
+CommunitiesList::setCommunities(const std::map<QString, QSharedPointer<Community>> &communities)
{
communities_.clear();
// TODO: still not sure how to handle the "world" special-case
WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
- communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item));
+ communities_.emplace("world", QSharedPointer<CommunitiesListItem>(world_list_item));
connect(world_list_item,
&WorldCommunityListItem::clicked,
this,
&CommunitiesList::highlightSelectedCommunity);
contentsLayout_->insertWidget(0, world_list_item);
- for (auto it = communities.constBegin(); it != communities.constEnd(); it++) {
- const auto community_id = it.key();
- const auto community = it.value();
-
- addCommunity(community, community_id);
+ for (const auto &community : communities) {
+ addCommunity(community.second, community.first);
- client_->fetchCommunityProfile(community_id);
- client_->fetchCommunityRooms(community_id);
+ client_->fetchCommunityProfile(community.first);
+ client_->fetchCommunityRooms(community.first);
}
world_list_item->setPressedState(true);
@@ -88,18 +83,12 @@ CommunitiesList::setCommunities(const QMap<QString, QSharedPointer<Community>> &
}
void
-CommunitiesList::clear()
-{
- communities_.clear();
-}
-
-void
CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString &community_id)
{
CommunitiesListItem *list_item =
new CommunitiesListItem(community, community_id, scrollArea_);
- communities_.insert(community_id, QSharedPointer<CommunitiesListItem>(list_item));
+ communities_.emplace(community_id, QSharedPointer<CommunitiesListItem>(list_item));
client_->fetchCommunityAvatar(community_id, community->getAvatar());
@@ -114,37 +103,36 @@ CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString
void
CommunitiesList::removeCommunity(const QString &community_id)
{
- communities_.remove(community_id);
+ communities_.erase(communities_.find(community_id));
}
void
CommunitiesList::updateCommunityAvatar(const QString &community_id, const QPixmap &img)
{
- if (!communities_.contains(community_id)) {
+ if (!communityExists(community_id)) {
qWarning() << "Avatar update on nonexistent community" << community_id;
return;
}
- communities_.value(community_id)->setAvatar(img.toImage());
+ communities_.find(community_id)->second->setAvatar(img.toImage());
}
void
CommunitiesList::highlightSelectedCommunity(const QString &community_id)
{
- emit communityChanged(community_id);
-
- if (!communities_.contains(community_id)) {
+ if (!communityExists(community_id)) {
qDebug() << "CommunitiesList: clicked unknown community";
return;
}
- for (auto it = communities_.constBegin(); it != communities_.constEnd(); it++) {
- if (it.key() != community_id) {
- it.value()->setPressedState(false);
+ emit communityChanged(community_id);
+
+ for (const auto &community : communities_) {
+ if (community.first != community_id) {
+ community.second->setPressedState(false);
} else {
- it.value()->setPressedState(true);
- scrollArea_->ensureWidgetVisible(
- qobject_cast<QWidget *>(it.value().data()));
+ community.second->setPressedState(true);
+ scrollArea_->ensureWidgetVisible(community.second.data());
}
}
}
diff --git a/src/Community.cc b/src/Community.cc
index a68f2b18..d563c151 100644
--- a/src/Community.cc
+++ b/src/Community.cc
@@ -6,29 +6,19 @@
void
Community::parseProfile(const QJsonObject &profile)
{
- if (profile["name"].type() == QJsonValue::Type::String) {
+ if (profile["name"].type() == QJsonValue::Type::String)
name_ = profile["name"].toString();
- } else {
+ else
name_ = "Unnamed Community"; // TODO: what is correct here?
- }
- if (profile["avatar_url"].type() == QJsonValue::Type::String) {
+ if (profile["avatar_url"].type() == QJsonValue::Type::String)
avatar_ = QUrl(profile["avatar_url"].toString());
- } else {
- avatar_ = QUrl();
- }
- if (profile["short_description"].type() == QJsonValue::Type::String) {
+ if (profile["short_description"].type() == QJsonValue::Type::String)
short_description_ = profile["short_description"].toString();
- } else {
- short_description_ = "";
- }
- if (profile["long_description"].type() == QJsonValue::Type::String) {
+ if (profile["long_description"].type() == QJsonValue::Type::String)
long_description_ = profile["long_description"].toString();
- } else {
- long_description_ = "";
- }
}
void
@@ -36,7 +26,8 @@ Community::parseRooms(const QJsonObject &rooms)
{
rooms_.clear();
- for (auto i = 0; i < rooms["chunk"].toArray().size(); i++) {
- rooms_.append(rooms["chunk"].toArray()[i].toObject()["room_id"].toString());
+ for (auto const &room : rooms["chunk"].toArray()) {
+ if (room.toObject().contains("room_id"))
+ rooms_.emplace_back(room.toObject()["room_id"].toString());
}
}
diff --git a/src/QuickSwitcher.cc b/src/QuickSwitcher.cc
index 2be636a4..6cc82501 100644
--- a/src/QuickSwitcher.cc
+++ b/src/QuickSwitcher.cc
@@ -138,10 +138,13 @@ QuickSwitcher::QuickSwitcher(QWidget *parent)
}
void
-QuickSwitcher::setRoomList(const QMap<QString, QString> &rooms)
+QuickSwitcher::setRoomList(const std::map<QString, QString> &rooms)
{
- rooms_ = rooms;
- QStringList items = rooms.keys();
+ rooms_ = rooms;
+
+ QStringList items;
+ for (const auto &room : rooms)
+ items << room.first;
completer_->setModel(new QStringListModel(items));
}
diff --git a/src/RoomList.cc b/src/RoomList.cc
index 61acfb83..fefd8dac 100644
--- a/src/RoomList.cc
+++ b/src/RoomList.cc
@@ -82,16 +82,15 @@ RoomList::clear()
}
void
-RoomList::addRoom(const QMap<QString, QSharedPointer<RoomSettings>> &settings,
+RoomList::addRoom(const QSharedPointer<RoomSettings> &settings,
const QSharedPointer<RoomState> &state,
const QString &room_id)
{
- RoomInfoListItem *room_item =
- new RoomInfoListItem(settings[room_id], state, room_id, scrollArea_);
+ auto room_item = new RoomInfoListItem(settings, state, room_id, scrollArea_);
connect(room_item, &RoomInfoListItem::clicked, this, &RoomList::highlightSelectedRoom);
connect(room_item, &RoomInfoListItem::leaveRoom, this, &RoomList::openLeaveRoomDialog);
- rooms_.insert(room_id, QSharedPointer<RoomInfoListItem>(room_item));
+ rooms_.emplace(room_id, QSharedPointer<RoomInfoListItem>(room_item));
if (!state->getAvatar().toString().isEmpty())
updateAvatar(room_id, state->getAvatar().toString());
@@ -124,21 +123,24 @@ RoomList::updateAvatar(const QString &room_id, const QString &url)
void
RoomList::removeRoom(const QString &room_id, bool reset)
{
- rooms_.remove(room_id);
+ rooms_.erase(rooms_.find(room_id));
- if (rooms_.isEmpty() || !reset)
+ if (rooms_.empty() || !reset)
return;
- auto first_room = rooms_.first();
- first_room->setPressedState(true);
+ auto room = firstRoom();
- emit roomChanged(rooms_.firstKey());
+ if (room.second.isNull())
+ return;
+
+ room.second->setPressedState(true);
+ emit roomChanged(room.first);
}
void
RoomList::updateUnreadMessageCount(const QString &roomid, int count)
{
- if (!rooms_.contains(roomid)) {
+ if (!roomExists(roomid)) {
qWarning() << "UpdateUnreadMessageCount: Unknown roomid";
return;
}
@@ -153,15 +155,17 @@ RoomList::calculateUnreadMessageCount()
{
int total_unread_msgs = 0;
- for (const auto &room : rooms_)
- total_unread_msgs += room->unreadMessageCount();
+ for (const auto &room : rooms_) {
+ if (!room.second.isNull())
+ total_unread_msgs += room.second->unreadMessageCount();
+ }
emit totalUnreadMessageCountUpdated(total_unread_msgs);
}
void
-RoomList::setInitialRooms(const QMap<QString, QSharedPointer<RoomSettings>> &settings,
- const QMap<QString, QSharedPointer<RoomState>> &states)
+RoomList::setInitialRooms(const std::map<QString, QSharedPointer<RoomSettings>> &settings,
+ const std::map<QString, QSharedPointer<RoomState>> &states)
{
rooms_.clear();
@@ -171,22 +175,18 @@ RoomList::setInitialRooms(const QMap<QString, QSharedPointer<RoomSettings>> &set
return;
}
- for (auto it = states.constBegin(); it != states.constEnd(); ++it) {
- const auto room_id = it.key();
- const auto state = it.value();
+ for (auto const &state : states)
+ addRoom(settings.at(state.first), state.second, state.first);
- addRoom(settings, state, room_id);
- }
-
- if (rooms_.isEmpty())
+ if (rooms_.empty())
return;
- setFilterRooms(filterRooms_);
-
- auto first_room = rooms_.first();
- first_room->setPressedState(true);
+ auto room = firstRoom();
+ if (room.second.isNull())
+ return;
- emit roomChanged(rooms_.firstKey());
+ room.second->setPressedState(true);
+ emit roomChanged(room.first);
}
void
@@ -212,33 +212,30 @@ RoomList::openLeaveRoomDialog(const QString &room_id)
}
void
-RoomList::sync(const QMap<QString, QSharedPointer<RoomState>> &states,
- const QMap<QString, QSharedPointer<RoomSettings>> &settings)
+RoomList::sync(const std::map<QString, QSharedPointer<RoomState>> &states,
+ const std::map<QString, QSharedPointer<RoomSettings>> &settings)
{
- for (auto it = states.constBegin(); it != states.constEnd(); ++it) {
- auto room_id = it.key();
- auto state = it.value();
+ for (auto const &state : states) {
+ if (!roomExists(state.first))
+ addRoom(settings.at(state.first), state.second, state.first);
- if (!rooms_.contains(room_id))
- addRoom(settings, state, room_id);
-
- auto room = rooms_[room_id];
+ auto room = rooms_[state.first];
auto current_avatar = room->state()->getAvatar();
- auto new_avatar = state->getAvatar();
+ auto new_avatar = state.second->getAvatar();
if (current_avatar != new_avatar && !new_avatar.toString().isEmpty())
- updateAvatar(room_id, new_avatar.toString());
+ updateAvatar(state.first, new_avatar.toString());
- room->setState(state);
+ room->setState(state.second);
}
}
void
RoomList::clearRoomMessageCount(const QString &room_id)
{
- if (!rooms_.contains(room_id))
+ if (!roomExists(room_id))
return;
auto room = rooms_[room_id];
@@ -252,7 +249,7 @@ RoomList::highlightSelectedRoom(const QString &room_id)
{
emit roomChanged(room_id);
- if (!rooms_.contains(room_id)) {
+ if (!roomExists(room_id)) {
qDebug() << "RoomList: clicked unknown roomid";
return;
}
@@ -261,13 +258,15 @@ RoomList::highlightSelectedRoom(const QString &room_id)
calculateUnreadMessageCount();
- for (auto it = rooms_.constBegin(); it != rooms_.constEnd(); ++it) {
- if (it.key() != room_id) {
- it.value()->setPressedState(false);
+ for (auto const &room : rooms_) {
+ if (room.second.isNull())
+ continue;
+
+ if (room.first != room_id) {
+ room.second->setPressedState(false);
} else {
- it.value()->setPressedState(true);
- scrollArea_->ensureWidgetVisible(
- qobject_cast<QWidget *>(it.value().data()));
+ room.second->setPressedState(true);
+ scrollArea_->ensureWidgetVisible(room.second.data());
}
}
@@ -277,12 +276,12 @@ RoomList::highlightSelectedRoom(const QString &room_id)
void
RoomList::updateRoomAvatar(const QString &roomid, const QPixmap &img)
{
- if (!rooms_.contains(roomid)) {
+ if (!roomExists(roomid)) {
qWarning() << "Avatar update on non existent room" << roomid;
return;
}
- rooms_.value(roomid)->setAvatar(img.toImage());
+ rooms_[roomid]->setAvatar(img.toImage());
// Used to inform other widgets for the new image data.
emit roomAvatarChanged(roomid, img);
@@ -291,12 +290,12 @@ RoomList::updateRoomAvatar(const QString &roomid, const QPixmap &img)
void
RoomList::updateRoomDescription(const QString &roomid, const DescInfo &info)
{
- if (!rooms_.contains(roomid)) {
+ if (!roomExists(roomid)) {
qWarning() << "Description update on non existent room" << roomid << info.body;
return;
}
- rooms_.value(roomid)->setDescriptionMessage(info);
+ rooms_[roomid]->setDescriptionMessage(info);
if (underMouse()) {
// When the user hover out of the roomlist a sort will be triggered.
@@ -359,9 +358,8 @@ RoomList::closeJoinRoomDialog(bool isJoining, QString roomAlias)
{
joinRoomModal_->fadeOut();
- if (isJoining) {
+ if (isJoining)
client_->joinRoom(roomAlias);
- }
}
void
@@ -369,48 +367,44 @@ RoomList::closeLeaveRoomDialog(bool leaving, const QString &room_id)
{
leaveRoomModal_->fadeOut();
- if (leaving) {
+ if (leaving)
client_->leaveRoom(room_id);
- }
}
void
-RoomList::setFilterRooms(bool filterRooms)
+RoomList::setFilterRooms(bool isFilteringEnabled)
{
- filterRooms_ = filterRooms;
-
for (int i = 0; i < contentsLayout_->count(); i++) {
// If roomFilter_ contains the room for the current RoomInfoListItem,
// show the list item, otherwise hide it
- RoomInfoListItem *listitem =
- (RoomInfoListItem *)contentsLayout_->itemAt(i)->widget();
+ auto listitem =
+ qobject_cast<RoomInfoListItem *>(contentsLayout_->itemAt(i)->widget());
- if (listitem != nullptr) {
- if (!filterRooms) {
- contentsLayout_->itemAt(i)->widget()->show();
- } else if (roomFilter_.contains(listitem->roomId())) {
- contentsLayout_->itemAt(i)->widget()->show();
- } else {
- contentsLayout_->itemAt(i)->widget()->hide();
- }
- }
+ if (!listitem)
+ continue;
+
+ if (!isFilteringEnabled || filterItemExists(listitem->roomId()))
+ listitem->show();
+ else
+ listitem->hide();
}
- if (filterRooms_ && !roomFilter_.contains(selectedRoom_)) {
+ if (isFilteringEnabled && !filterItemExists(selectedRoom_)) {
RoomInfoListItem *firstVisibleRoom = nullptr;
+
for (int i = 0; i < contentsLayout_->count(); i++) {
QWidget *item = contentsLayout_->itemAt(i)->widget();
+
if (item != nullptr && item->isVisible()) {
- firstVisibleRoom = (RoomInfoListItem *)item;
+ firstVisibleRoom = qobject_cast<RoomInfoListItem *>(item);
break;
}
}
- if (firstVisibleRoom != nullptr) {
+
+ if (firstVisibleRoom != nullptr)
highlightSelectedRoom(firstVisibleRoom->roomId());
- }
} else {
- scrollArea_->ensureWidgetVisible(
- qobject_cast<QWidget *>(rooms_.value(selectedRoom_).data()));
+ scrollArea_->ensureWidgetVisible(rooms_[selectedRoom_].data());
}
}
@@ -429,13 +423,13 @@ RoomList::syncInvites(const std::map<std::string, mtx::responses::InvitedRoom> &
for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) {
const auto room_id = QString::fromStdString(it->first);
- if (!rooms_.contains(room_id))
+ if (!roomExists(room_id))
addInvitedRoom(room_id, it->second);
}
}
void
-RoomList::setRoomFilter(QList<QString> room_ids)
+RoomList::setRoomFilter(std::vector<QString> room_ids)
{
roomFilter_ = room_ids;
setFilterRooms(true);
@@ -448,10 +442,22 @@ RoomList::addInvitedRoom(const QString &room_id, const mtx::responses::InvitedRo
connect(room_item, &RoomInfoListItem::acceptInvite, this, &RoomList::acceptInvite);
connect(room_item, &RoomInfoListItem::declineInvite, this, &RoomList::declineInvite);
- rooms_.insert(room_id, QSharedPointer<RoomInfoListItem>(room_item));
+ rooms_.emplace(room_id, QSharedPointer<RoomInfoListItem>(room_item));
updateAvatar(room_id, QString::fromStdString(room.avatar()));
int pos = contentsLayout_->count() - 1;
contentsLayout_->insertWidget(pos, room_item);
}
+
+std::pair<QString, QSharedPointer<RoomInfoListItem>>
+RoomList::firstRoom() const
+{
+ auto firstRoom = rooms_.begin();
+
+ while (firstRoom->second.isNull() && firstRoom != rooms_.end())
+ firstRoom++;
+
+ return std::pair<QString, QSharedPointer<RoomInfoListItem>>(firstRoom->first,
+ firstRoom->second);
+}
diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc
index 42145819..0a81b06b 100644
--- a/src/timeline/TimelineViewManager.cc
+++ b/src/timeline/TimelineViewManager.cc
@@ -89,7 +89,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid,
const QString &filename,
const QString &url)
{
- if (!views_.contains(roomid)) {
+ if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.image message to a non-managed view";
return;
}
@@ -104,7 +104,7 @@ TimelineViewManager::queueFileMessage(const QString &roomid,
const QString &filename,
const QString &url)
{
- if (!views_.contains(roomid)) {
+ if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.file message to a non-managed view";
return;
}
@@ -119,7 +119,7 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
const QString &filename,
const QString &url)
{
- if (!views_.contains(roomid)) {
+ if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.audio message to a non-managed view";
return;
}
@@ -130,15 +130,6 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
}
void
-TimelineViewManager::clearAll()
-{
- for (auto view : views_)
- removeWidget(view.data());
-
- views_.clear();
-}
-
-void
TimelineViewManager::initialize(const mtx::responses::Rooms &rooms)
{
for (auto it = rooms.join.cbegin(); it != rooms.join.cend(); ++it) {
@@ -147,11 +138,10 @@ TimelineViewManager::initialize(const mtx::responses::Rooms &rooms)
}
void
-TimelineViewManager::initialize(const QList<QString> &rooms)
+TimelineViewManager::initialize(const std::vector<QString> &rooms)
{
- for (const auto &roomid : rooms) {
+ for (const auto &roomid : rooms)
addRoom(roomid);
- }
}
void
@@ -159,7 +149,7 @@ TimelineViewManager::addRoom(const mtx::responses::JoinedRoom &room, const QStri
{
// Create a history view with the room events.
TimelineView *view = new TimelineView(room.timeline, client_, room_id);
- views_.insert(room_id, QSharedPointer<TimelineView>(view));
+ views_.emplace(room_id, QSharedPointer<TimelineView>(view));
connect(view,
&TimelineView::updateLastTimelineMessage,
@@ -179,7 +169,7 @@ TimelineViewManager::addRoom(const QString &room_id)
{
// Create a history view without any events.
TimelineView *view = new TimelineView(client_, room_id);
- views_.insert(room_id, QSharedPointer<TimelineView>(view));
+ views_.emplace(room_id, QSharedPointer<TimelineView>(view));
connect(view,
&TimelineView::updateLastTimelineMessage,
@@ -200,12 +190,12 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
for (auto it = rooms.join.cbegin(); it != rooms.join.cend(); ++it) {
auto roomid = QString::fromStdString(it->first);
- if (!views_.contains(roomid)) {
+ if (!timelineViewExists(roomid)) {
qDebug() << "Ignoring event from unknown room" << roomid;
continue;
}
- auto view = views_.value(roomid);
+ auto view = views_.at(roomid);
int msgs_added = view->addEvents(it->second.timeline);
@@ -223,13 +213,13 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
void
TimelineViewManager::setHistoryView(const QString &room_id)
{
- if (!views_.contains(room_id)) {
+ if (!timelineViewExists(room_id)) {
qDebug() << "Room ID from RoomList is not present in ViewManager" << room_id;
return;
}
active_room_ = room_id;
- auto view = views_.value(room_id);
+ auto view = views_.at(room_id);
setCurrentWidget(view.data());
@@ -237,7 +227,7 @@ TimelineViewManager::setHistoryView(const QString &room_id)
view->scrollDown();
}
-QMap<QString, QString> TimelineViewManager::DISPLAY_NAMES;
+std::map<QString, QString> TimelineViewManager::DISPLAY_NAMES;
QString
TimelineViewManager::chooseRandomColor()
@@ -300,8 +290,8 @@ TimelineViewManager::chooseRandomColor()
QString
TimelineViewManager::displayName(const QString &userid)
{
- if (DISPLAY_NAMES.contains(userid))
- return DISPLAY_NAMES.value(userid);
+ if (DISPLAY_NAMES.find(userid) != DISPLAY_NAMES.end())
+ return DISPLAY_NAMES.at(userid);
return userid;
}
@@ -310,7 +300,7 @@ bool
TimelineViewManager::hasLoaded() const
{
for (const auto &view : views_)
- if (!view->hasLoaded())
+ if (!view.second->hasLoaded())
return false;
return true;
|
