From a1e08d59a3a7c4b4831216afa755c4e0579b2ed7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Feb 2019 19:49:00 +0300 Subject: added operator[] for XMLConstHandle & XMLHandle, making Xpath much shorter --- protocols/Gadu-Gadu/src/avatar.cpp | 3 +-- protocols/Gadu-Gadu/src/oauth.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index a4bbb7dde7..d05ab14865 100644 --- a/protocols/Gadu-Gadu/src/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp @@ -84,8 +84,7 @@ bool GaduProto::getAvatarFileInfo(uin_t uin, char **avatarurl, char **avatarts) // if this url returned xml data (before and after 11.2013 gg convention) TiXmlDocument doc; if (doc.Parse(resp->pData) == 0) { - tinyxml2::XMLConstHandle pRoot(doc.FirstChildElement("result")); - auto *node = pRoot.FirstChildElement("users").FirstChildElement("user").FirstChildElement("avatars").FirstChildElement("avatar").ToElement(); + auto *node = TiXmlConst(doc.FirstChildElement("result"))["users"]["user"]["avatars"]["avatar"].ToElement(); const char *blank = (node != nullptr) ? node->Attribute("blank") : nullptr; if (mir_strcmp(blank, "1")) { auto *p = node->FirstChildElement("timestamp"); diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp index 4142ac5598..805f92bed0 100644 --- a/protocols/Gadu-Gadu/src/oauth.cpp +++ b/protocols/Gadu-Gadu/src/oauth.cpp @@ -304,11 +304,11 @@ int GaduProto::oauth_receivetoken() if (resp->resultCode == 200 && resp->dataLength > 0 && resp->pData) { TiXmlDocument doc; if (0 == doc.Parse(resp->pData)) { - tinyxml2::XMLConstHandle hXml(doc.FirstChildElement("result")); - if (auto *p = hXml.FirstChildElement("oauth_token").ToElement()) + TiXmlConst hXml(doc.FirstChildElement("result")); + if (auto *p = hXml["oauth_token"].ToElement()) token = mir_strdup(p->GetText()); - if (auto *p = hXml.FirstChildElement("oauth_token_secret").ToElement()) + if (auto *p = hXml["oauth_token_secret"].ToElement()) token_secret = mir_strdup(p->GetText()); } } @@ -373,11 +373,11 @@ int GaduProto::oauth_receivetoken() if (resp->resultCode == 200 && resp->dataLength > 0 && resp->pData) { TiXmlDocument doc; if (0 == doc.Parse(resp->pData)) { - tinyxml2::XMLConstHandle hXml(doc.FirstChildElement("result")); - if (auto *p = hXml.FirstChildElement("oauth_token").ToElement()) + TiXmlConst hXml(doc.FirstChildElement("result")); + if (auto *p = hXml["oauth_token"].ToElement()) token = mir_strdup(p->GetText()); - if (auto *p = hXml.FirstChildElement("oauth_token_secret").ToElement()) + if (auto *p = hXml["oauth_token_secret"].ToElement()) token_secret = mir_strdup(p->GetText()); } } -- cgit v1.2.3