From b6de8047c1113030b64c81e58c2ba37c062639ae Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:37:12 +0300 Subject: Skype: C++'11 iterators --- protocols/SkypeWeb/src/requests/chatrooms.h | 6 +++--- protocols/SkypeWeb/src/requests/contacts.h | 4 ++-- protocols/SkypeWeb/src/requests/subscriptions.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/SkypeWeb/src/requests') diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h index feb6461e60..607dd462d1 100644 --- a/protocols/SkypeWeb/src/requests/chatrooms.h +++ b/protocols/SkypeWeb/src/requests/chatrooms.h @@ -97,12 +97,12 @@ public: JSONNode node; JSONNode members(JSON_ARRAY); members.set_name("members"); - for (int i = 0; i < skypenames.getCount(); i++) + for (auto &it : skypenames) { JSONNode member; member - << JSONNode("id", CMStringA(::FORMAT, "8:%s", skypenames[i]).GetBuffer()) - << JSONNode("role", !mir_strcmpi(skypenames[i], li.szSkypename) ? "Admin" : "User"); + << JSONNode("id", CMStringA(::FORMAT, "8:%s", it).GetBuffer()) + << JSONNode("role", !mir_strcmpi(it, li.szSkypename) ? "Admin" : "User"); members << member; } node << members; diff --git a/protocols/SkypeWeb/src/requests/contacts.h b/protocols/SkypeWeb/src/requests/contacts.h index 39c0278508..40edfcc63d 100644 --- a/protocols/SkypeWeb/src/requests/contacts.h +++ b/protocols/SkypeWeb/src/requests/contacts.h @@ -45,8 +45,8 @@ public: << CHAR_VALUE("X-Skypetoken", li.api.szToken) << CHAR_VALUE("Accept", "application/json"); - for (int i = 0; i < skypenames.getCount(); i++) - Body << CHAR_VALUE("contacts[]", skypenames[i]); + for (auto &it : skypenames) + Body << CHAR_VALUE("contacts[]", it); } }; diff --git a/protocols/SkypeWeb/src/requests/subscriptions.h b/protocols/SkypeWeb/src/requests/subscriptions.h index 5b3ea7c4d2..6075228a4e 100644 --- a/protocols/SkypeWeb/src/requests/subscriptions.h +++ b/protocols/SkypeWeb/src/requests/subscriptions.h @@ -61,10 +61,10 @@ public: JSONNode node; JSONNode contacts(JSON_ARRAY); contacts.set_name("contacts"); - for (int i = 0; i < skypenames.getCount(); i++) + for (auto &it : skypenames) { JSONNode contact; - contact << JSONNode("id", CMStringA(::FORMAT, "8:%s", skypenames[i])); + contact << JSONNode("id", CMStringA(::FORMAT, "8:%s", it)); contacts << contact; } node << contacts; -- cgit v1.2.3