From ed4897b7ef69e862806a8c07f1fd475262d0c36e Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 24 Jul 2019 20:58:51 +0300
Subject: massive warning fix

---
 protocols/Gadu-Gadu/src/avatar.cpp   | 2 +-
 protocols/Gadu-Gadu/src/core.cpp     | 6 +++---
 protocols/Gadu-Gadu/src/gg.cpp       | 2 +-
 protocols/Gadu-Gadu/src/services.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'protocols/Gadu-Gadu/src')

diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp
index 2a2c40f71d..7c6c8ad707 100644
--- a/protocols/Gadu-Gadu/src/avatar.cpp
+++ b/protocols/Gadu-Gadu/src/avatar.cpp
@@ -28,7 +28,7 @@
 //
 void GaduProto::getAvatarFilename(MCONTACT hContact, wchar_t *pszDest, int cbLen)
 {
-	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	if (_waccess(pszDest, 0)) {
 		int ret = CreateDirectoryTreeW(pszDest);
diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 1ed90ba67c..d1d74dbc57 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -363,7 +363,7 @@ void __cdecl GaduProto::mainthread(void *)
 				showpopup(m_tszUserName, error.c_str(), GG_POPUP_WARNING | GG_POPUP_ALLOW_MSGBOX);
 			}
 			else
-				debugLogA("mainthread() (%x): Loading forwarding host %s and port %d.", pHost, p.external_port, this);
+				debugLogA("mainthread() (%x): Loading forwarding host %s and port %d.", pHost.get(), p.external_port, this);
 
 			if (p.external_addr)
 				p.external_port = m_gaduOptions.forwardPort;
@@ -960,7 +960,7 @@ retry:
 
 				mir_snwprintf(szMsg, L"%s (%s)", szText,
 					*e->event.multilogon_info.sessions[i].name != '\0' ?
-					_A2T(e->event.multilogon_info.sessions[i].name) : TranslateT("Unknown client"));
+					_A2T(e->event.multilogon_info.sessions[i].name).get() : TranslateT("Unknown client"));
 				showpopup(m_tszUserName, szMsg, GG_POPUP_MULTILOGON);
 			}
 			mir_free(iIndexes);
@@ -1217,7 +1217,7 @@ void GaduProto::OnContactDeleted(MCONTACT hContact)
 	if (isChatRoom(hContact) && wszRoomId != NULL && gc_enabled)
 	{
 		GGGC *chat = gc_lookup(wszRoomId);
-		debugLogA("contactdeleted(): Terminating chat %x, id %s from contact list...", chat, wszRoomId);
+		debugLogA("contactdeleted(): Terminating chat %x, id %s from contact list...", chat, wszRoomId.get());
 		if (chat)
 		{
 			// Destroy chat entry
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index ad6f811ade..09a379ecfc 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -168,7 +168,7 @@ void GaduProto::cleanuplastplugin(DWORD version)
 		debugLogA("cleanuplastplugin() 1: version=%d Cleaning junk avatar files from < 0.11.0.2", version);
 
 		wchar_t avatarsPath[MAX_PATH];
-		mir_snwprintf(avatarsPath, L"%s\\%s", VARSW(L"%miranda_avatarcache%"), m_tszUserName);
+		mir_snwprintf(avatarsPath, L"%s\\%s", VARSW(L"%miranda_avatarcache%").get(), m_tszUserName);
 
 		debugLogW(L"cleanuplastplugin() 1: miranda_avatarcache = %s", avatarsPath);
 
diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index 2b959d6e9d..8fee1a1798 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -222,7 +222,7 @@ INT_PTR GaduProto::getavatarinfo(WPARAM wParam, LPARAM lParam)
 		if (AvatarName)
 		{
 			char AvatarNameWithTS[128];
-			mir_snprintf(AvatarNameWithTS, "%s%s", ++AvatarName, AvatarTs);
+			mir_snprintf(AvatarNameWithTS, "%s%s", ++AvatarName, AvatarTs.get());
 			AvatarHash = gg_avatarhash(AvatarNameWithTS);
 		}
 	}
-- 
cgit v1.2.3