From 842305935dae96495bb70f5976489e4e79a2491d Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 19 Feb 2019 19:24:04 +0300
Subject: compilation fix

---
 protocols/JabberG/src/jabber_agent.cpp     |  2 +-
 protocols/JabberG/src/jabber_caps.cpp      | 10 +++++-----
 protocols/JabberG/src/jabber_groupchat.cpp |  2 +-
 protocols/JabberG/src/jabber_search.cpp    |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'protocols')

diff --git a/protocols/JabberG/src/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp
index 07894f0f1d..61a7176bba 100644
--- a/protocols/JabberG/src/jabber_agent.cpp
+++ b/protocols/JabberG/src/jabber_agent.cpp
@@ -267,7 +267,7 @@ public:
 					}
 					else {
 						GetDlgItemText(hFrame, id, str2, 128);
-						XmlAddChild(query, pszName, T2Utf(str2));
+						XmlAddChild(query, pszName, T2Utf(str2).get());
 						id++;
 					}
 				}
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 2d5ca5b347..aae787a123 100755
--- a/protocols/JabberG/src/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
@@ -165,15 +165,15 @@ void CJabberProto::OnIqResultCapsDiscoInfo(const TiXmlElement*, CJabberIqInfo *p
 			if (!mir_strcmp(szFormTypeValue, "urn:xmpp:dataforms:softwareinfo")) {
 				JSONNode root;
 				if (pCaps->m_szOs = mir_strdup(XPath(xform, "field[@var='os']/value")))
-					root.push_back(JSONNode("o", pCaps->m_szOs));
+					root.push_back(JSONNode("o", pCaps->m_szOs.get()));
 				if (pCaps->m_szOsVer = mir_strdup(XPath(xform, "field[@var='os_version']/value")))
-					root.push_back(JSONNode("ov", pCaps->m_szOsVer));
+					root.push_back(JSONNode("ov", pCaps->m_szOsVer.get()));
 				if (pCaps->m_szSoft = mir_strdup(XPath(xform, "field[@var='software']/value")))
-					root.push_back(JSONNode("s", pCaps->m_szSoft));
+					root.push_back(JSONNode("s", pCaps->m_szSoft.get()));
 				if (pCaps->m_szSoftVer = mir_strdup(XPath(xform, "field[@var='software_version']/value")))
-					root.push_back(JSONNode("sv", pCaps->m_szSoftVer));
+					root.push_back(JSONNode("sv", pCaps->m_szSoftVer.get()));
 				if (pCaps->m_szSoftMir = mir_strdup(XPath(xform, "field[@var='x-miranda-core-version']/value")))
-					root.push_back(JSONNode("sm", pCaps->m_szSoftMir));
+					root.push_back(JSONNode("sm", pCaps->m_szSoftMir.get()));
 				root.push_back(JSONNode("c", CMStringA(FORMAT, "%lld", jcbCaps)));
 
 				CMStringA szName(FORMAT, "%S#%S", pCaps->GetNode(), pCaps->GetHash());
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 7e3d7d30c6..ef5c9ba096 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -416,7 +416,7 @@ protected:
 			if (hData) {
 				wchar_t *buf = (wchar_t *)GlobalLock(hData);
 				if (buf && wcschr(buf, '@') && !wcschr(buf, ' '))
-					pInfo = new JabberGcRecentInfo(m_proto, T2Utf(buf));
+					pInfo = new JabberGcRecentInfo(m_proto, T2Utf(buf).get());
 				GlobalUnlock(hData);
 			}
 			CloseClipboard();
diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index ef39ad41d6..99d77d6c38 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -325,7 +325,7 @@ void CJabberProto::OnIqResultAdvancedSearch(const TiXmlElement *iqNode, CJabberI
 					if (const char* var = fieldNode->Attribute("var")) {
 						if (auto *textNode = fieldNode->FirstChildElement("value")) {
 							Utf2T wszVar(var), wszText(textNode->GetText());
-							if (!mColumnsNames[wszVar])
+							if (!mColumnsNames[wszVar.get()])
 								mColumnsNames.insert(wszVar, wszVar);
 							pUserColumn->insert(wszVar, wszText);
 						}
@@ -751,7 +751,7 @@ HWND CJabberProto::SearchAdvanced(HWND hwndDlg)
 			wchar_t szFieldValue[100];
 			GetWindowText(dat->pJSInf[i].hwndValueItem, szFieldValue, _countof(szFieldValue));
 			if (szFieldValue[0] != 0) {
-				XmlAddChild(query, T2Utf(dat->pJSInf[i].szFieldName), T2Utf(szFieldValue));
+				XmlAddChild(query, T2Utf(dat->pJSInf[i].szFieldName).get(), T2Utf(szFieldValue).get());
 				fRequestNotEmpty = TRUE;
 			}
 		}
-- 
cgit v1.2.3