summaryrefslogtreecommitdiff
path: root/protocols/FacebookRM/src/process.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-01-04 15:09:01 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-01-04 15:09:01 +0300
commit823e3839b108658811f689f959f51058effd82ac (patch)
treeb65b8618fb5c61c7e73cf8c0204cbd961a6b08c9 /protocols/FacebookRM/src/process.cpp
parentd3f84250fdaa48e0ca1032b92b9c0f827707655b (diff)
ะก++'11 scope for's are suddenly more effective...
Diffstat (limited to 'protocols/FacebookRM/src/process.cpp')
-rw-r--r--protocols/FacebookRM/src/process.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp
index fc8f1ea67e..cfbcdeec99 100644
--- a/protocols/FacebookRM/src/process.cpp
+++ b/protocols/FacebookRM/src/process.cpp
@@ -157,12 +157,11 @@ void FacebookProto::ProcessFriendList(void*)
}
// Check remaining contacts in map and add them to contact list
- for (std::map< std::string, facebook_user* >::iterator it = friends.begin(); it != friends.end();) {
- if (!it->second->deleted)
- AddToContactList(it->second, true); // we know this contact doesn't exists, so we force add it
+ for (auto &it : friends) {
+ if (!it.second->deleted)
+ AddToContactList(it.second, true); // we know this contact doesn't exists, so we force add it
- delete it->second;
- it = friends.erase(it);
+ delete it.second;
}
friends.clear();
@@ -714,7 +713,7 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message> &messages, boo
}
// 2. remove all marked messages from list
- for (std::vector<facebook_message>::iterator it = messages.begin(); it != messages.end();) {
+ for (auto it = messages.begin(); it != messages.end();) {
if ((*it).flag_ == 1)
it = messages.erase(it);
else
@@ -760,8 +759,8 @@ void FacebookProto::ReceiveMessages(std::vector<facebook_message> &messages, boo
// Set thread id (TID) for later
setString(hChatContact, FACEBOOK_KEY_TID, fbc->thread_id.c_str());
- for (auto jt = fbc->participants.begin(); jt != fbc->participants.end(); ++jt)
- AddChatContact(fbc->thread_id.c_str(), jt->second, false);
+ for (auto &jt : fbc->participants)
+ AddChatContact(fbc->thread_id.c_str(), jt.second, false);
}
if (!hChatContact)
@@ -955,8 +954,8 @@ void FacebookProto::ShowNotifications()
ScopedLock s(facy.notifications_lock_);
// Show popups for unseen notifications and/or write them to chatroom
- for (std::map<std::string, facebook_notification*>::iterator it = facy.notifications.begin(); it != facy.notifications.end(); ++it) {
- facebook_notification *notification = it->second;
+ for (auto &it : facy.notifications) {
+ facebook_notification *notification = it.second;
if (notification != nullptr && !notification->seen) {
debugLogA(" Showing popup for notification ID: %s", notification->id.c_str());
ptrW szText(mir_utf8decodeW(notification->text.c_str()));