final switch to the typed icolib api

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

5 files changed, 12 insertions, 12 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp
index d4527e8091..00cc8ab90b 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp
@@ -265,7 +265,7 @@ static int changeState(TAAAProtoSetting& setting, STATES newState)
 	log_debugA("%s state change: %s -> %s", setting.szName, 

 		status2descr(setting.oldState), status2descr(setting.curState));

 

-	NotifyEventHooks(hStateChangedEvent, (WPARAM)0, (LPARAM)(AUTOAWAYSETTING*)&setting);

+	NotifyEventHooks(hStateChangedEvent, 0, (LPARAM)(AUTOAWAYSETTING*)&setting);

 	if ( setting.curState != SET_ORGSTATUS && setting.curState != ACTIVE && setting.statusChanged ) {

 		/* change the awaymessage */

 		if (setting.szMsg != NULL) {

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
index a4101b1b88..f9599f7b4d 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
@@ -207,8 +207,8 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 						flags = 0;

 

 					// clear box and add new status, loop status and check if compatible with proto

-					SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0);

-					SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0);

+					SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_RESETCONTENT, 0, 0);

+					SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, 0, 0);

 					for ( i=0; i < SIZEOF(statusModeList); i++ ) {

 						if ( (flags & statusModePf2List[i]) || statusModePf2List[i] == PF2_OFFLINE || bSettingSame ) {

 							TCHAR *statusMode = ( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR );

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index d7d4ae0230..396fd04963 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -888,8 +888,8 @@ static void CheckContinueslyFunction(void *arg)
 			return;

 		}

 		log_infoA("KeepStatus: connection lost! (continuesly check)");

-		NotifyEventHooks(hConnectionEvent, (WPARAM)KS_CONN_STATE_LOST, (LPARAM)NULL);

-		ProcessPopup(KS_CONN_STATE_LOST, (LPARAM)NULL);

+		NotifyEventHooks(hConnectionEvent, (WPARAM)KS_CONN_STATE_LOST, 0);

+		ProcessPopup(KS_CONN_STATE_LOST, 0);

 		maxRetries = DBGetContactSettingByte(NULL, MODULENAME, SETTING_MAXRETRIES, 0);

 		if (maxRetries == 0) 

 			maxRetries = -1;

@@ -989,8 +989,8 @@ static int ProcessPopup(int reason, LPARAM lParam)
 					}

 					if (DBGetContactSettingByte(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE)) {

 						CallProtoService(ps[i]->szName, PS_GETNAME, sizeof(protoName), (LPARAM)protoName);

-						//_snprintf(protoInfoLine, sizeof(protoInfoLine), Translate("%s\t(will be set to %s)\r\n"), protoName, (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ps[i]->status, (LPARAM)0));

-						_snprintf(protoInfoLine, sizeof(protoInfoLine), "%s\t(%s %s)\r\n", protoName, Translate("will be set to"), (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ps[i]->status, (LPARAM)0));

+						//_snprintf(protoInfoLine, sizeof(protoInfoLine), Translate("%s\t(will be set to %s)\r\n"), protoName, (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ps[i]->status, 0));

+						_snprintf(protoInfoLine, sizeof(protoInfoLine), "%s\t(%s %s)\r\n", protoName, Translate("will be set to"), (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ps[i]->status, 0));

 						strncat(protoInfo, protoInfoLine, sizeof(protoInfo)-strlen(protoInfo)-1);

 					}

 				}

diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index 410412072c..2584043769 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -148,7 +148,7 @@ static char* GetLinkDescription(TSettingsList& protoSettings)
 		else if ( protoSettings[i].status == ID_STATUS_CURRENT )

 			status = Translate("<current>");

 		else if ( protoSettings[i].status >= MIN_STATUS && protoSettings[i].status <= MAX_STATUS )

-			status = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)protoSettings[i].status, (LPARAM)0);

+			status = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)protoSettings[i].status, 0);

 		if (status == NULL)

 			status = "<unknown>";

 

@@ -967,12 +967,12 @@ static int ClearDatabase(char* filter)
 	dbces.szModule = MODULENAME;

 	dbces.lParam = (LPARAM)&settingCount;

 	dbces.pfnEnumProc = CountSettings;

-	CallService(MS_DB_CONTACT_ENUMSETTINGS,(WPARAM)NULL,(LPARAM)&dbces);

+	CallService(MS_DB_CONTACT_ENUMSETTINGS,0,(LPARAM)&dbces);

 

 	settings = ( char** )malloc(settingCount*sizeof(char*));

 	dbces.lParam = (LPARAM)&settings;

 	dbces.pfnEnumProc = DeleteSetting;

-	CallService(MS_DB_CONTACT_ENUMSETTINGS,(WPARAM)NULL,(LPARAM)&dbces);

+	CallService(MS_DB_CONTACT_ENUMSETTINGS,0,(LPARAM)&dbces);

 	for (i=0; i < settingCount; i++) {

 		if ((filter == NULL) || (!strncmp(filter, settings[i], strlen(filter))))

 			DBDeleteContactSetting(NULL, MODULENAME, settings[i]);

diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp
index 8db3ce577b..0381de0b69 100644
--- a/plugins/StatusPlugins/confirmdialog.cpp
+++ b/plugins/StatusPlugins/confirmdialog.cpp
@@ -92,7 +92,7 @@ static INT_PTR CALLBACK StatusMessageDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam
 			break;

 

 		case IDC_CANCEL:

-			SendMessage(GetParent(hwndDlg), UM_STSMSGDLGCLOSED, (WPARAM)0, 0);

+			SendMessage(GetParent(hwndDlg), UM_STSMSGDLGCLOSED, 0, 0);

 			EndDialog(hwndDlg, IDC_CANCEL);

 			break;

 		}

@@ -351,7 +351,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 									

 					flags = CallProtoService(proto->szName, PS_GETCAPS,PFLAGNUM_2,0)&~CallProtoService(proto->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0);

 					// clear box and add new status, loop status and check if compatible with proto

-					SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0);

+					SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_RESETCONTENT, 0, 0);

 					actualStatus = proto->status;

 

 					// last