final switch to the typed icolib api

git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 6 insertions, 12 deletions

diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp
index bdc4b9af60..1e525d8d5c 100644
--- a/plugins/Variables/src/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
@@ -195,7 +195,7 @@ TCHAR* getContactInfoT(BYTE type, HANDLE hContact)
 	ci.cbSize = sizeof(CONTACTINFO);

 	ci.hContact = hContact;

 	ci.dwFlag = type | CNF_UNICODE;

-	CallService(MS_CONTACT_GETCONTACTINFO, (WPARAM)0, (LPARAM)&ci);

+	CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci);

 

 	memset(szVal, '\0', sizeof(szVal));

 	switch(ci.type)

diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp
index 8b852b7f6c..1fabf8fa49 100644
--- a/plugins/Variables/src/help.cpp
+++ b/plugins/Variables/src/help.cpp
@@ -1188,7 +1188,7 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l
 		urd.cbSize = sizeof(urd);

 		urd.hInstance = hInst;

 		urd.hwndDlg = hwndDlg;

-		urd.lParam = (LPARAM)0;

+		urd.lParam = 0;

 		// ! uses ANSI version !

 		urd.lpTemplate = MAKEINTRESOURCEA(IDD_HELP_DIALOG);

 		urd.pfnResizer = helpDialogResize;

@@ -1315,14 +1315,8 @@ INT_PTR getSkinItemService(WPARAM wParam, LPARAM lParam)
 

 	switch (item) {

 	case VSI_HELPICON:

-		if (hHelpIcon == NULL) {

-			if (ServiceExists(MS_SKIN2_GETICON))

-				hHelpIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"vars_help");

-

-			if (hHelpIcon == NULL)

-				hHelpIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_V), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0);

-		}

-

+		if (hHelpIcon == NULL)

+			hHelpIcon = Skin_GetIcon("vars_help");

 		return (INT_PTR)hHelpIcon;

 

 	case VSI_HELPTIPTEXT:

diff --git a/plugins/Variables/src/tokenregister.cpp b/plugins/Variables/src/tokenregister.cpp
index 0418c3024f..7a7bbcf95f 100644
--- a/plugins/Variables/src/tokenregister.cpp
+++ b/plugins/Variables/src/tokenregister.cpp
@@ -209,7 +209,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai)
 		if (thisVr->flags & TRF_PARSEFUNC )

 			callRes = (INT_PTR)thisVr->parseFunction( &cAi );

 		else if (thisVr->szService != NULL)

-			callRes = CallService( thisVr->szService, (WPARAM)0, (LPARAM)&cAi );

+			callRes = CallService( thisVr->szService, 0, (LPARAM)&cAi );

 

 		for ( j=0; j < cAi.argc; j++ )

 			if (cAi.argv[j] != NULL)

@@ -223,7 +223,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai)
 		if (thisVr->flags & TRF_PARSEFUNC )

 			callRes = (INT_PTR)thisVr->parseFunctionT( ai );

 		else if (thisVr->szService != NULL)

-			callRes = CallService( thisVr->szService, (WPARAM)0, (LPARAM)ai );

+			callRes = CallService( thisVr->szService, 0, (LPARAM)ai );

 

 		if ((TCHAR*)callRes != NULL)

 			res = mir_tstrdup((TCHAR*)callRes );