From 2afddc4305325447f91d879af7d5c4c280257867 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Wed, 29 Jul 2015 18:50:37 +0000 Subject: SkypeWeb: code optimization git-svn-id: http://svn.miranda-ng.org/main/trunk@14754 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/requests/chatrooms.h | 47 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'protocols/SkypeWeb/src/requests/chatrooms.h') diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h index 1062b9f4b7..3a5b28c111 100644 --- a/protocols/SkypeWeb/src/requests/chatrooms.h +++ b/protocols/SkypeWeb/src/requests/chatrooms.h @@ -48,11 +48,12 @@ public: << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken) << CHAR_VALUE("Content-Type", "application/json; charset=UTF-8"); - JSONNode node(JSON_NODE); - node.push_back(JSONNode("clientmessageid", (long)timestamp)); - node.push_back(JSONNode("messagetype", "RichText")); - node.push_back(JSONNode("contenttype", "text")); - node.push_back(JSONNode("content", message)); + JSONNode node; + node + << JSONNode("clientmessageid", (long)timestamp) + << JSONNode("messagetype", "RichText") + << JSONNode("contenttype", "text") + << JSONNode("content", message); Body << VALUE(node.write().c_str()); } @@ -70,11 +71,12 @@ public: << CHAR_VALUE("Content-Type", "application/json; charset=UTF-8"); JSONNode node(JSON_NODE); - node.push_back(JSONNode("clientmessageid", (long)timestamp)); - node.push_back(JSONNode("messagetype", "RichText")); - node.push_back(JSONNode("contenttype", "text")); - node.push_back(JSONNode("content", message)); - node.push_back(JSONNode("skypeemoteoffset", 4)); + node + << JSONNode("clientmessageid", (long)timestamp) + << JSONNode("messagetype", "RichText") + << JSONNode("contenttype", "text") + << JSONNode("content", message) + << JSONNode("skypeemoteoffset", 4); Body << VALUE(node.write().c_str()); } @@ -93,19 +95,18 @@ public: << CHAR_VALUE("Content-Type", "application/json; charset=UTF-8") << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken); - JSONNode node(JSON_NODE); - JSONNode members(JSON_ARRAY); - - members.set_name("members"); + JSONNode node; + JSONNode members(JSON_ARRAY); members.set_name("members"); for (int i = 0; i < skypenames.getCount(); i++) { - JSONNode member(JSON_NODE); - member.push_back(JSONNode("id", CMStringA(::FORMAT, "8:%s", skypenames[i]).GetBuffer())); - member.push_back(JSONNode("role", !mir_strcmpi(skypenames[i], selfname) ? "Admin" : "User")); - members.push_back(member); + JSONNode member; + member + << JSONNode("id", CMStringA(::FORMAT, "8:%s", skypenames[i]).GetBuffer()) + << JSONNode("role", !mir_strcmpi(skypenames[i], selfname) ? "Admin" : "User"); + members << member; } - node.push_back(members); + node << members; Body << VALUE(node.write().c_str()); } @@ -137,9 +138,9 @@ public: << CHAR_VALUE("Content-Type", "application/json; charset=UTF-8") << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken); - JSONNode node(JSON_NODE); + JSONNode node; - node.push_back(JSONNode("role", role)); + node << JSONNode("role", role); Body << VALUE(node.write().c_str()); } @@ -169,8 +170,8 @@ public: << CHAR_VALUE("Content-Type", "application/json; charset=UTF-8") << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken); - JSONNode node(JSON_NODE); - node.push_back(JSONNode(propname, value)); + JSONNode node; + node << JSONNode(propname, value); Body << VALUE(node.write().c_str()); } -- cgit v1.2.3