diff options
| author | George Hazan <ghazan@miranda.im> | 2019-02-14 19:49:00 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-02-14 19:49:00 +0300 |
| commit | a1e08d59a3a7c4b4831216afa755c4e0579b2ed7 (patch) | |
| tree | 0de8c7596fb27e0c7856011412beef9383ac87c2 /protocols/Gadu-Gadu/src | |
| parent | 4fd7e4b563949b0f82d4e5fc81727af2de38da31 (diff) | |
added operator[] for XMLConstHandle & XMLHandle, making Xpath much shorter
Diffstat (limited to 'protocols/Gadu-Gadu/src')
| -rw-r--r-- | protocols/Gadu-Gadu/src/avatar.cpp | 3 | ||||
| -rw-r--r-- | protocols/Gadu-Gadu/src/oauth.cpp | 12 |
2 files changed, 7 insertions, 8 deletions
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());
}
}
|