From 55322c4cdb498eab3fdd1f472b5f096bafbbfffa Mon Sep 17 00:00:00 2001
From: MikalaiR <nikolay.romanovich@narod.ru>
Date: Sat, 4 Jun 2016 18:08:00 +0000
Subject: core: clang compilation fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@16914 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_app/src/menu_utils.cpp     | 4 ++--
 src/mir_app/src/netlibhttp.cpp     | 2 +-
 src/mir_app/src/netliblog.cpp      | 2 +-
 src/mir_app/src/netlibsecurity.cpp | 2 +-
 src/mir_app/src/pluginopts.cpp     | 2 +-
 src/mir_app/src/skinicons.cpp      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp
index b4cf7fcf73..e2bb5df76a 100644
--- a/src/mir_app/src/menu_utils.cpp
+++ b/src/mir_app/src/menu_utils.cpp
@@ -745,7 +745,7 @@ MIR_APP_DLL(HGENMENU) Menu_AddItem(int hMenuObject, TMO_MenuItem *pmi, void *pUs
 		if (pmi->uid != miid_last && pRoot->mi.uid == miid_last) {
 			char szUid[100];
 			bin2hex(&pmi->uid, sizeof(pmi->uid), szUid);
-			Netlib_Logf("[MENU]: fake UUID added to menu item %s", szUid);
+			Netlib_Logf(0, "[MENU]: fake UUID added to menu item %s", szUid);
 
 			pRoot->mi.uid = pmi->uid;
 			pRoot->mi.uid.d[7]--; // and make it slightly different
@@ -898,7 +898,7 @@ static int sttDumpItem(TMO_IntMenuItem *pmi, void *szModule)
 		bin2hex(&pmi->mi.uid, sizeof(pmi->mi.uid), menuItemName);
 
 		int bVisible = (pmi->mi.flags & CMIF_HIDDEN) == 0;
-		TCHAR *ptszName = (pmi->ptszCustomName != NULL) ? pmi->ptszCustomName : _T("");
+		const TCHAR *ptszName = (pmi->ptszCustomName != NULL) ? pmi->ptszCustomName : _T("");
 		
 		char szRootUid[33];
 		if (pmi->mi.root == NULL)
diff --git a/src/mir_app/src/netlibhttp.cpp b/src/mir_app/src/netlibhttp.cpp
index a3657fa79b..e5e6e2b78d 100644
--- a/src/mir_app/src/netlibhttp.cpp
+++ b/src/mir_app/src/netlibhttp.cpp
@@ -267,7 +267,7 @@ struct HttpSecurityContext
 
 			szAuthHdr = NtlmCreateResponseFromChallenge(m_hNtlmSecurity, szChallenge, szLogin, szPassw, true, complete);
 			if (!szAuthHdr)
-				NetlibLogf(NULL, "Security login %s failed, user: %S pssw: %S", szProvider, szLogin ? szLogin : _T("(no user)"), szPassw ? _T("(exist)") : _T("(no psw)"));
+				NetlibLogf(NULL, "Security login %s failed, user: %S pssw: %S", szProvider, szLogin ? szLogin.get() : _T("(no user)"), szPassw ? _T("(exist)") : _T("(no psw)"));
 			else if (justCreated)
 				proxyAuthList.add(m_szHost, m_szProvider);
 		}
diff --git a/src/mir_app/src/netliblog.cpp b/src/mir_app/src/netliblog.cpp
index e83ba04bee..9957a631c4 100644
--- a/src/mir_app/src/netliblog.cpp
+++ b/src/mir_app/src/netliblog.cpp
@@ -66,7 +66,7 @@ static void InitLog()
 
 	ptrT szBuf(db_get_tsa(NULL, "Netlib", "File"));
 	if (mir_tstrlen(szBuf)) {
-		logOptions.tszUserFile = szBuf;
+		logOptions.tszUserFile = szBuf.get();
 
 		TCHAR path[MAX_PATH];
 		PathToAbsoluteT(VARST(szBuf), path);
diff --git a/src/mir_app/src/netlibsecurity.cpp b/src/mir_app/src/netlibsecurity.cpp
index e634e2dd27..827c52bb5b 100644
--- a/src/mir_app/src/netlibsecurity.cpp
+++ b/src/mir_app/src/netlibsecurity.cpp
@@ -215,7 +215,7 @@ char* NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge,
 	NtlmHandleType* hNtlm = (NtlmHandleType*)hSecurity;
 	if (mir_tstrcmpi(hNtlm->szProvider, _T("Basic"))) {
 		bool isGSSAPI = mir_tstrcmpi(hNtlm->szProvider, _T("GSSAPI")) == 0;
-		TCHAR *szProvider = isGSSAPI ? _T("Kerberos") : hNtlm->szProvider;
+		TCHAR *szProvider = isGSSAPI ? (TCHAR*)_T("Kerberos") : hNtlm->szProvider;
 		bool hasChallenge = szChallenge != NULL && szChallenge[0] != '\0';
 		if (hasChallenge) {
 			unsigned tokenLen;
diff --git a/src/mir_app/src/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp
index 9fdba92a4c..8f26724714 100644
--- a/src/mir_app/src/pluginopts.cpp
+++ b/src/mir_app/src/pluginopts.cpp
@@ -434,7 +434,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 						SetDlgItemText(hwndDlg, IDC_PLUGINEMAIL, tszEmail);
 
 						ptrT p(Langpack_PcharToTchar(dat->description));
-						SetDlgItemText(hwndDlg, IDC_PLUGINLONGINFO, sel ? p : _T(""));
+						SetDlgItemText(hwndDlg, IDC_PLUGINLONGINFO, sel ? p.get() : _T(""));
 
 						ptrT tszCopyright(latin2t(sel ? dat->copyright : NULL));
 						SetDlgItemText(hwndDlg, IDC_PLUGINCPYR, tszCopyright);
diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index 360e1742d5..daea186017 100644
--- a/src/mir_app/src/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -385,7 +385,7 @@ int LoadSkinIcons(void)
 	// Add main icons to list
 	for (int i = 0; i < _countof(mainIcons); i++) {
 		mir_snprintf(iconName, "%s%d", mainIconsFmt, i);
-		sid.section.a = mainIcons[i].section == NULL ? LPGEN("Main icons") : (char*)mainIcons[i].section;
+		sid.section.a = mainIcons[i].section == NULL ? (char*)LPGEN("Main icons") : (char*)mainIcons[i].section;
 		sid.description.a = (char*)mainIcons[i].description;
 		sid.iDefaultIndex = mainIcons[i].resource_id;
 		mainIcons[i].hIcolib = IcoLib_AddIcon(&sid, 0);
-- 
cgit v1.2.3