From 6d6cb956a78b2dbfa7e8d62f4234d8f27b100468 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 23 Nov 2017 22:06:26 +0300
Subject: database enumerators => void* instead of LPARAM

---
 src/mir_app/src/db_ini.cpp       |  4 ++--
 src/mir_app/src/proto_accs.cpp   |  4 ++--
 src/mir_app/src/srmm_toolbar.cpp |  2 +-
 src/mir_core/src/db.cpp          | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp
index 0c22077b3d..c670c66917 100644
--- a/src/mir_app/src/db_ini.cpp
+++ b/src/mir_app/src/db_ini.cpp
@@ -272,7 +272,7 @@ struct SettingsList
 	SettingsList *next;
 } *setting_items = nullptr;
 
-int SettingsEnumProc(const char *szSetting, LPARAM)
+int SettingsEnumProc(const char *szSetting, void *)
 {
 	SettingsList *newItem = (SettingsList *)mir_alloc(sizeof(SettingsList));
 	newItem->name = mir_strdup(szSetting);
@@ -303,7 +303,7 @@ struct ESFDParam
 	const char *pMask;
 };
 
-static int EnumSettingsForDeletion(const char *szSetting, LPARAM param)
+static int EnumSettingsForDeletion(const char *szSetting, void *param)
 {
 	ESFDParam *pParam = (ESFDParam*)param;
 	if (wildcmpi(szSetting, pParam->pMask))
diff --git a/src/mir_app/src/proto_accs.cpp b/src/mir_app/src/proto_accs.cpp
index 1d5d5511db..0410de15a8 100644
--- a/src/mir_app/src/proto_accs.cpp
+++ b/src/mir_app/src/proto_accs.cpp
@@ -43,7 +43,7 @@ LIST<PROTOACCOUNT> accounts(10, CompareAccounts);
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static int EnumDbModules(const char *szModuleName, DWORD, LPARAM)
+static int EnumDbModules(const char *szModuleName, void*)
 {
 	ptrA szProtoName(db_get_sa(0, szModuleName, "AM_BaseProto"));
 	if (szProtoName) {
@@ -128,7 +128,7 @@ typedef struct
 }
 enumDB_ProtoProcParam;
 
-static int enumDB_ProtoProc(const char* szSetting, LPARAM lParam)
+static int enumDB_ProtoProc(const char* szSetting, void *lParam)
 {
 	if (szSetting) {
 		enumDB_ProtoProcParam* p = (enumDB_ProtoProcParam*)lParam;
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp
index 82758f7478..90db284edb 100644
--- a/src/mir_app/src/srmm_toolbar.cpp
+++ b/src/mir_app/src/srmm_toolbar.cpp
@@ -831,7 +831,7 @@ static void CALLBACK SrmmLoadToolbar()
 	DestroyHookableEvent(hHookToolBarLoadedEvt);
 }
 
-static int ConvertToolbarData(const char *szSetting, LPARAM)
+static int ConvertToolbarData(const char *szSetting, void*)
 {
 	DBVARIANT dbv;
 	if (!db_get(0, "Tab" MODULENAME, szSetting, &dbv)) {
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index ccd0cd1e9d..15e9f2465d 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -45,9 +45,9 @@ MIR_CORE_DLL(MIDatabase*) db_get_current()
 	return currDb;
 }
 
-static int sttEnumVars(const char *szVarName, LPARAM lParam)
+static int sttEnumVars(const char *szVarName, void *param)
 {
-	LIST<char>* vars = (LIST<char>*)lParam;
+	LIST<char>* vars = (LIST<char>*)param;
 	vars->insert(mir_strdup(szVarName));
 	return 0;
 }
@@ -92,17 +92,17 @@ MIR_CORE_DLL(int) db_is_contact(MCONTACT hContact)
 /////////////////////////////////////////////////////////////////////////////////////////
 // enumerators
 
-MIR_CORE_DLL(int) db_enum_modules(DBMODULEENUMPROC pFunc, const void *param)
+MIR_CORE_DLL(int) db_enum_modules(DBMODULEENUMPROC pFunc, void *param)
 {
 	return (currDb) ? currDb->EnumModuleNames(pFunc, param) : 0;
 }
 
-MIR_CORE_DLL(int) db_enum_residents(DBMODULEENUMPROC pFunc, const void *param)
+MIR_CORE_DLL(int) db_enum_residents(DBMODULEENUMPROC pFunc, void *param)
 {
 	return (currDb) ? currDb->EnumResidentSettings(pFunc, param) : 0;
 }
 
-EXTERN_C MIR_CORE_DLL(int) db_enum_settings(MCONTACT hContact, DBSETTINGENUMPROC pFunc, const char *szModule, const void *param)
+EXTERN_C MIR_CORE_DLL(int) db_enum_settings(MCONTACT hContact, DBSETTINGENUMPROC pFunc, const char *szModule, void *param)
 {
 	return (currDb) ? currDb->EnumContactSettings(hContact, pFunc, szModule, param) : 0;
 }
-- 
cgit v1.2.3