final switch to the typed icolib api

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

4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
index 14e539ea0d..7026ae13ef 100644
--- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
@@ -71,11 +71,11 @@ void	CSendEmail::Send() {
 	//ci.dwFlag = CNF_TCHAR;

 

 	ci.dwFlag = CNF_EMAIL | CNF_TCHAR;

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

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

 	m_Email = mir_t2a(ci.pszVal);

 

 	ci.dwFlag = CNF_DISPLAY | CNF_TCHAR;

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

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

 	m_FriendlyName = mir_t2a(ci.pszVal);

 

 	mir_free(ci.pszVal);

diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index 788ebca4d1..819086ead7 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
@@ -57,7 +57,7 @@ CSendHTTPServer::~CSendHTTPServer(){
 //---------------------------------------------------------------------------

 void	CSendHTTPServer::Send() {

 

-	if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, (WPARAM)true, (LPARAM)0) != 0) {

+	if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, (WPARAM)true, 0) != 0) {

 		Error(NULL, _T("Could not start the HTTP Server plugin."));

 		return;

 	}

diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 2061f80d83..249227a91a 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -562,7 +562,7 @@ LRESULT TfrmMain::wmTimer(WPARAM wParam, LPARAM lParam) {
 			#ifdef _DEBUG

 				OutputDebugStringA("SS Bitmap Timer Stop (CaptureDone)\r\n" );

 			#endif

-			SendMessage(m_hWnd,UM_EVENT, (WPARAM)0, (LPARAM)EVT_CaptureDone);

+			SendMessage(m_hWnd,UM_EVENT, 0, (LPARAM)EVT_CaptureDone);

 		}

 	}

 	return FALSE;

@@ -809,7 +809,7 @@ void TfrmMain::btnCaptureClick() {
 	}

 	else {

 		m_Screenshot = CaptureWindow(m_hTargetWindow, (BOOL)(m_opt_chkClientArea));

-		SendMessage(m_hWnd,UM_EVENT, (WPARAM)0, (LPARAM)EVT_CaptureDone);

+		SendMessage(m_hWnd,UM_EVENT, 0, (LPARAM)EVT_CaptureDone);

 	}

 }

 

@@ -1148,10 +1148,10 @@ void TfrmMain::FormClose() {
 		m_cSend->Send();

 		if (m_cSend->m_bFreeOnExit) cboxSendByChange();

 //		Not finish delete this if events from m_opt_cboxSendBy implementet

-		SendMessage(m_hWnd,UM_EVENT, (WPARAM)0, (LPARAM)EVT_CheckOpenAgain);

+		SendMessage(m_hWnd,UM_EVENT, 0, (LPARAM)EVT_CheckOpenAgain);

 	}

 	else {

-		SendMessage(m_hWnd,UM_EVENT, (WPARAM)0, (LPARAM)EVT_CheckOpenAgain);

+		SendMessage(m_hWnd,UM_EVENT, 0, (LPARAM)EVT_CheckOpenAgain);

 	}

 }

 

diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp
index 33718faf98..c3a16a43e4 100644
--- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp
+++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp
@@ -163,7 +163,7 @@ static VOID IcoLib_CheckIconPackVersion(LPTSTR szIconPack)
  **/

 HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big)

 {

-	return (pszIcon) ? (HICON)CallService(MS_SKIN2_GETICON, (WPARAM)big, (LPARAM) pszIcon) : NULL;

+	return (pszIcon) ? Skin_GetIcon(pszIcon, big) : NULL;

 }

 

 /**

@@ -175,7 +175,7 @@ HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big)
  **/

 HICON IcoLib_GetIconByHandle(HANDLE hIconItem, bool big)

 {

-	return (HICON)CallService(MS_SKIN2_GETICONBYHANDLE, (WPARAM)big, (LPARAM) hIconItem);

+	return Skin_GetIconByHandle(hIconItem, big);

 }

 

 /**