final switch to the typed icolib api

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

6 files changed, 10 insertions, 10 deletions

diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp
index 34263addc8..f48e94278e 100644
--- a/plugins/SecureIM/src/crypt_icons.cpp
+++ b/plugins/SecureIM/src/crypt_icons.cpp
@@ -66,9 +66,9 @@ IconExtraColumn mode2iec(int mode) {
 	int i=1+m*IEC_CNT+IEC_CL_DIS+s;

 	if ( g_IEC[i].hImage==(HANDLE)-1 ) {

 /*		g_hIEC[i] = mode2icon(mode,1);

-		g_IEC[i].hImage = (HANDLE) CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)g_hIEC[i], (LPARAM)0);*/

+		g_IEC[i].hImage = (HANDLE) CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)g_hIEC[i], 0);*/

 		HICON icon = mode2icon(mode,1);

-		g_IEC[i].hImage = (HANDLE) CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, (LPARAM)0);

+		g_IEC[i].hImage = (HANDLE) CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, 0);

 	}

 	return g_IEC[i];

 }

diff --git a/plugins/SecureIM/src/dbevent.cpp b/plugins/SecureIM/src/dbevent.cpp
index 9b7d8f10c0..7b26631502 100644
--- a/plugins/SecureIM/src/dbevent.cpp
+++ b/plugins/SecureIM/src/dbevent.cpp
@@ -14,7 +14,7 @@ void HistoryLog(HANDLE hContact, LPCSTR szText) {
 	dbei.cbBlob = (int)strlen(szText) + 1;

 	dbei.pBlob = (PBYTE)szText;

 

-	CallService(MS_DB_EVENT_ADD, (WPARAM)0, (LPARAM)&dbei);

+	CallService(MS_DB_EVENT_ADD, 0, (LPARAM)&dbei);

 }

 

 

diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp
index 3303424626..77bcb57168 100644
--- a/plugins/SecureIM/src/loadicons.cpp
+++ b/plugins/SecureIM/src/loadicons.cpp
@@ -27,7 +27,7 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam)
 {

 	HICON hIcon;

 	for (int i=0; icons[i].key; i++) {

-		hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)icons[i].name);

+		hIcon = Skin_GetIcon(icons[i].name);

 		if(icons[i].tbl == TBL_IEC)

 			g_hIEC[icons[i].idx]=hIcon;

 		else

@@ -78,7 +78,7 @@ void InitIcons(void)
 		sid.iDefaultIndex = icons[i].key;

 		sid.hDefaultIcon = (HICON)LoadImage(g_hIconInst, MAKEINTRESOURCE(icons[i].key), IMAGE_ICON, 16, 16, LR_SHARED);

 		Skin_AddIcon(&sid);

-		hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)icons[i].name);

+		hIcon = Skin_GetIcon(icons[i].name);

 

 		if(icons[i].tbl == TBL_IEC)

 			g_hIEC[icons[i].idx]=hIcon;

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 841a7764a0..5d2a27215d 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -212,12 +212,12 @@ int __cdecl onModulesLoaded(WPARAM wParam,LPARAM lParam) {
 			cws.szSetting = "rsa_priv";

 			cws.value.pbVal = (PBYTE)&priv_key;

 			cws.value.cpbVal = priv_len;

-			CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)0, (LPARAM)&cws);

+			CallService(MS_DB_CONTACT_WRITESETTING, 0, (LPARAM)&cws);

 

 			cws.szSetting = "rsa_pub";

 			cws.value.pbVal = (PBYTE)&pub_key;

 			cws.value.cpbVal = pub_len;

-			CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)0, (LPARAM)&cws);

+			CallService(MS_DB_CONTACT_WRITESETTING, 0, (LPARAM)&cws);

 

 			DBDeleteContactSetting(0, szModuleName, "rsa_priv_2048");

 			DBDeleteContactSetting(0, szModuleName, "rsa_pub_2048");

diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp
index 6e698a7dae..eba769f9ca 100644
--- a/plugins/SecureIM/src/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
@@ -1180,7 +1180,7 @@ void RefreshGeneralDlg(HWND hDlg, BOOL iInit) {
 		}

 		hContact = db_find_next(hContact);

 	}

-	ListView_Sort(hLV,(LPARAM)0);

+	ListView_Sort(hLV,0);

 }

 

 

diff --git a/plugins/SecureIM/src/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp
index e72221dc91..bfb954b2c5 100644
--- a/plugins/SecureIM/src/svcs_rsa.cpp
+++ b/plugins/SecureIM/src/svcs_rsa.cpp
@@ -167,12 +167,12 @@ unsigned __stdcall sttGenerateRSA( LPVOID param ) {
 	cws.szSetting = "rsa_priv";

 	cws.value.pbVal = (PBYTE)&priv_key;

 	cws.value.cpbVal = priv_len;

-	CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)0, (LPARAM)&cws);

+	CallService(MS_DB_CONTACT_WRITESETTING, 0, (LPARAM)&cws);

 

 	cws.szSetting = "rsa_pub";

 	cws.value.pbVal = (PBYTE)&pub_key;

 	cws.value.cpbVal = pub_len;

-	CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)0, (LPARAM)&cws);

+	CallService(MS_DB_CONTACT_WRITESETTING, 0, (LPARAM)&cws);

 

 	rsa_4096=1;