From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Jan 2015 17:49:54 +0000 Subject: MEVENT - the strict type for events, they are not HANDLE anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@11866 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Msg_Export/src/options.cpp | 10 +++++----- plugins/Msg_Export/src/utils.cpp | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'plugins/Msg_Export/src') diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 1390af62c4..0c14b89862 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -57,9 +57,9 @@ class CLDBEvent DWORD time; public: MCONTACT hUser; - HANDLE hDbEvent; + MEVENT hDbEvent; - CLDBEvent(MCONTACT hU, HANDLE hDBE ) + CLDBEvent(MCONTACT hU, MEVENT hDBE) { hUser = hU; hDbEvent = hDBE; @@ -221,9 +221,9 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected ) MCONTACT hContact = (MCONTACT)sItem.lParam; - list< CLDBEvent > & rclCurList = AllEvents[ GetFilePathFromUser( hContact) ]; + list &rclCurList = AllEvents[ GetFilePathFromUser( hContact) ]; - HANDLE hDbEvent = db_event_first(hContact); + MEVENT hDbEvent = db_event_first(hContact); while( hDbEvent) { rclCurList.push_back(CLDBEvent(hContact, hDbEvent)); hDbEvent = db_event_next(hContact, hDbEvent); @@ -260,7 +260,7 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected ) list< CLDBEvent >::const_iterator iterator; for (iterator = FileIterator->second.begin() ; iterator != FileIterator->second.end() ; ++iterator ) { - HANDLE hDbEvent = (*iterator).hDbEvent; + MEVENT hDbEvent = (*iterator).hDbEvent; nExportEvent( (WPARAM) (*iterator).hUser, (LPARAM)hDbEvent); } SendMessage( hProg, PBM_SETPOS, ++nCur, 0); diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index 1db6774808..3adbec1191 100755 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -1408,10 +1408,8 @@ void ExportDBEventInfo(MCONTACT hContact, DBEVENTINFO &dbei ) ///////////////////////////////////////////////////////////////////// -int nExportEvent(WPARAM wparam,LPARAM lparam) +int nExportEvent(WPARAM hContact, LPARAM hDbEvent) { - MCONTACT hContact = (MCONTACT)wparam; - HANDLE hDbEvent = (HANDLE)lparam; if ( !db_get_b(hContact,MODULE,"EnableLog",1)) return 0; -- cgit v1.2.3