From 6d6cb956a78b2dbfa7e8d62f4234d8f27b100468 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 23 Nov 2017 22:06:26 +0300 Subject: database enumerators => void* instead of LPARAM --- plugins/TabSRMM/src/chat_main.cpp | 2 +- plugins/TabSRMM/src/sendlater.cpp | 6 +++--- plugins/TabSRMM/src/sendlater.h | 4 ++-- plugins/TabSRMM/src/sendqueue.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/chat_main.cpp b/plugins/TabSRMM/src/chat_main.cpp index 93c5485407..395b4b0402 100644 --- a/plugins/TabSRMM/src/chat_main.cpp +++ b/plugins/TabSRMM/src/chat_main.cpp @@ -155,7 +155,7 @@ void Chat_ModulesLoaded() ///////////////////////////////////////////////////////////////////////////////////////// // load the group chat module -static int CopyChatSetting(const char *szSetting, LPARAM param) +static int CopyChatSetting(const char *szSetting, void *param) { LIST *szSettings = (LIST*)param; szSettings->insert(mir_strdup(szSetting)); diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index 2858ef040a..e76b4b79e0 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -235,7 +235,7 @@ bool CSendLater::processCurrentJob() // stub used as enum proc for the database enumeration, collecting // all entries in the SendLater module // (static function) -int _cdecl CSendLater::addStub(const char *szSetting, LPARAM lParam) +int _cdecl CSendLater::addStub(const char *szSetting, void *lParam) { return(sendLater->addJob(szSetting, lParam)); } @@ -272,9 +272,9 @@ void CSendLater::processContacts() // // @param lParam: a contact handle for which the job should be scheduled // @return 0 on failure, 1 otherwise -int CSendLater::addJob(const char *szSetting, LPARAM lParam) +int CSendLater::addJob(const char *szSetting, void *lParam) { - MCONTACT hContact = lParam; + MCONTACT hContact = (MCONTACT)lParam; DBVARIANT dbv = { 0 }; char *szOrig_Utf = nullptr; diff --git a/plugins/TabSRMM/src/sendlater.h b/plugins/TabSRMM/src/sendlater.h index 0694024616..d257488872 100644 --- a/plugins/TabSRMM/src/sendlater.h +++ b/plugins/TabSRMM/src/sendlater.h @@ -102,11 +102,11 @@ public: void flushQueue() { m_last_sendlater_processed = 0; } bool haveJobs() const { return (m_sendLaterJobList.getCount() != 0 && m_currJob != -1); } - static int _cdecl addStub(const char *szSetting, LPARAM lParam); + static int _cdecl addStub(const char *szSetting, void *lParam); bool processCurrentJob(); void processContacts(); - int addJob(const char *szSetting, LPARAM lParam); + int addJob(const char *szSetting, void *lParam); void addContact(const MCONTACT hContact); HANDLE processAck(const ACKDATA *ack); diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index 60dc9eb154..a84eda1481 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -597,7 +597,7 @@ int SendQueue::doSendLater(int iJobIndex, CTabBaseDlg *dat, MCONTACT hContact, b } else { mir_snprintf(tszMsg, required, "%s%s", utf_header, job->szSendBuffer); - sendLater->addJob(tszMsg, hContact); + sendLater->addJob(tszMsg, (void*)hContact); } mir_free(tszMsg); -- cgit v1.2.3