From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Msg_Export/src/FileViewer.cpp | 8 ++++---- plugins/Msg_Export/src/FileViewer.h | 4 ++-- plugins/Msg_Export/src/main.cpp | 4 ++-- plugins/Msg_Export/src/options.cpp | 24 ++++++++++++------------ plugins/Msg_Export/src/utils.cpp | 22 +++++++++++----------- plugins/Msg_Export/src/utils.h | 10 +++++----- 6 files changed, 36 insertions(+), 36 deletions(-) (limited to 'plugins/Msg_Export') diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp index 4c42c78ba3..21b8396764 100755 --- a/plugins/Msg_Export/src/FileViewer.cpp +++ b/plugins/Msg_Export/src/FileViewer.cpp @@ -103,7 +103,7 @@ class CLHistoryDlg public: HWND hWnd; - HCONTACT hContact; + MCONTACT hContact; tstring sPath; HWND hFindDlg; @@ -113,7 +113,7 @@ class CLHistoryDlg bool bFirstLoad; bool bUtf8File; - CLHistoryDlg( HCONTACT hContact) : hContact( hContact ) + CLHistoryDlg( MCONTACT hContact) : hContact( hContact ) { hFindDlg = NULL; acFindStr[0] = 0; @@ -489,7 +489,7 @@ void UpdateFileViews( const TCHAR *pszFile ) // Developer : KN ///////////////////////////////////////////////////////////////////// -bool bOpenExternaly( HCONTACT hContact ) +bool bOpenExternaly( MCONTACT hContact ) { tstring sPath = GetFilePathFromUser( hContact); @@ -1232,7 +1232,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, // Developer : KN ///////////////////////////////////////////////////////////////////// -bool bShowFileViewer(HCONTACT hContact) +bool bShowFileViewer(MCONTACT hContact) { HWND hInternalWindow = WindowList_Find(hInternalWindowList,hContact); if(hInternalWindow) { diff --git a/plugins/Msg_Export/src/FileViewer.h b/plugins/Msg_Export/src/FileViewer.h index fb060a2c50..897047438b 100755 --- a/plugins/Msg_Export/src/FileViewer.h +++ b/plugins/Msg_Export/src/FileViewer.h @@ -24,8 +24,8 @@ void Uninitilize(); void UpdateFileViews( const TCHAR *pszFile); -bool bOpenExternaly( HCONTACT hContact); -bool bShowFileViewer( HCONTACT hContact); +bool bOpenExternaly( MCONTACT hContact); +bool bShowFileViewer( MCONTACT hContact); bool bUseInternalViewer( bool bNew); bool bUseInternalViewer(); diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index 1aafecbf02..8670284b34 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -62,10 +62,10 @@ static INT_PTR ShowExportHistory(WPARAM wParam, LPARAM /*lParam*/) { if (bUseInternalViewer()) { - bShowFileViewer((HCONTACT)wParam); + bShowFileViewer((MCONTACT)wParam); return 0; } - bOpenExternaly((HCONTACT)wParam); + bOpenExternaly((MCONTACT)wParam); return 0; } diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index a56473331b..cee3a516be 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -56,10 +56,10 @@ class CLDBEvent { DWORD time; public: - HCONTACT hUser; + MCONTACT hUser; HANDLE hDbEvent; - CLDBEvent(HCONTACT hU, HANDLE hDBE ) + CLDBEvent(MCONTACT hU, HANDLE hDBE ) { hUser = hU; hDbEvent = hDBE; @@ -92,15 +92,15 @@ public: int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { if (lParamSort == 1 ) - return _tcsicmp( NickFromHandle((HCONTACT)lParam1), NickFromHandle((HCONTACT)lParam2)); + return _tcsicmp( NickFromHandle((MCONTACT)lParam1), NickFromHandle((MCONTACT)lParam2)); if (lParamSort == 2 ) - return _DBGetString((HCONTACT)lParam1, "Protocol", "p", _T("")).compare(_DBGetString((HCONTACT)lParam2, "Protocol", "p", _T(""))); + return _DBGetString((MCONTACT)lParam1, "Protocol", "p", _T("")).compare(_DBGetString((MCONTACT)lParam2, "Protocol", "p", _T(""))); if (lParamSort == 3 ) { - DWORD dwUin1 = db_get_dw((HCONTACT)lParam1, _DBGetStringA((HCONTACT)lParam1, "Protocol", "p", "" ).c_str(), "UIN", 0); - DWORD dwUin2 = db_get_dw((HCONTACT)lParam2, _DBGetStringA((HCONTACT)lParam2, "Protocol", "p", "" ).c_str(), "UIN", 0); + DWORD dwUin1 = db_get_dw((MCONTACT)lParam1, _DBGetStringA((MCONTACT)lParam1, "Protocol", "p", "" ).c_str(), "UIN", 0); + DWORD dwUin2 = db_get_dw((MCONTACT)lParam2, _DBGetStringA((MCONTACT)lParam2, "Protocol", "p", "" ).c_str(), "UIN", 0); if (dwUin1 == dwUin2 ) return 0; if (dwUin1 > dwUin2 ) @@ -221,7 +221,7 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected ) continue; } - HCONTACT hContact = (HCONTACT)sItem.lParam; + MCONTACT hContact = (MCONTACT)sItem.lParam; list< CLDBEvent > & rclCurList = AllEvents[ GetFilePathFromUser( hContact) ]; @@ -315,7 +315,7 @@ void SetToDefault( HWND hParent ) continue; tstring sFileName = szTemp; - ReplaceDefines((HCONTACT)sItem.lParam, sFileName); + ReplaceDefines((MCONTACT)sItem.lParam, sFileName); ReplaceTimeVariables( sFileName); sItem.mask = LVIF_TEXT; @@ -400,7 +400,7 @@ BOOL bApplyChanges( HWND hwndDlg ) if (ListView_GetItem( hMapUser, &sItem)) { - HCONTACT hUser = (HCONTACT)sItem.lParam; + MCONTACT hUser = (MCONTACT)sItem.lParam; if (_tcslen( szTemp) > 0 ) db_set_ts(hUser, MODULE, "FileName", szTemp); else @@ -493,7 +493,7 @@ void AutoFindeFileNames(HWND hwndDlg) } int nShortestMatch = 0xFFFF; - HCONTACT hStortest = 0; + MCONTACT hStortest = 0; int nStortestIndex = -1; for (int nSubCur = 0 ; nSubCur < nCount ; nSubCur++ ) { @@ -514,7 +514,7 @@ void AutoFindeFileNames(HWND hwndDlg) { nShortestMatch = (int)nLen; nStortestIndex = nSubCur; - hStortest = (HCONTACT)sItem.lParam; + hStortest = (MCONTACT)sItem.lParam; } } } @@ -678,7 +678,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar { tstring sTmp; LVITEM sItem = { 0 }; - HCONTACT hContact = db_find_first(); + MCONTACT hContact = db_find_first(); for (int nUser = 0; /*hContact*/ ; nUser++ ) { sItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index c7b03b5e3b..cfe4c7d70b 100755 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -255,7 +255,7 @@ void DisplayLastError(const TCHAR *pszError) // Developer : KN ///////////////////////////////////////////////////////////////////// -const TCHAR* NickFromHandle(HCONTACT hContact) +const TCHAR* NickFromHandle(MCONTACT hContact) { const TCHAR *psz = (const TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR); if (psz ) @@ -279,7 +279,7 @@ const TCHAR* NickFromHandle(HCONTACT hContact) // Developer : KN ///////////////////////////////////////////////////////////////////// -tstring _DBGetStringW(HCONTACT hContact,const char *szModule,const char *szSetting, const TCHAR *pszError ) +tstring _DBGetStringW(MCONTACT hContact,const char *szModule,const char *szSetting, const TCHAR *pszError ) { tstring ret; DBVARIANT dbv = {0}; @@ -302,7 +302,7 @@ tstring _DBGetStringW(HCONTACT hContact,const char *szModule,const char *szSetti return ret; } -string _DBGetStringA(HCONTACT hContact,const char *szModule,const char *szSetting, const char *pszError ) +string _DBGetStringA(MCONTACT hContact,const char *szModule,const char *szSetting, const char *pszError ) { string ret; DBVARIANT dbv = {0}; @@ -596,7 +596,7 @@ void ReplaceDBPath( tstring &sRet ) // Developer : KN ///////////////////////////////////////////////////////////////////// -tstring GetFilePathFromUser( HCONTACT hContact ) +tstring GetFilePathFromUser( MCONTACT hContact ) { tstring sFilePath = sExportDir + _DBGetString( hContact, MODULE, "FileName", sDefaultFile.c_str()); @@ -707,7 +707,7 @@ tstring GetFilePathFromUser( HCONTACT hContact ) // Developer : KN ///////////////////////////////////////////////////////////////////// -tstring FileNickFromHandle( HCONTACT hContact) +tstring FileNickFromHandle( MCONTACT hContact) { tstring ret = NickFromHandle( hContact); string::size_type nCur = 0; @@ -754,7 +754,7 @@ void ReplaceAllNoColon( tstring &sSrc, const TCHAR *pszReplace, tstring &sNew) // Developer : KN ///////////////////////////////////////////////////////////////////// -void ReplaceDefines( HCONTACT hContact, tstring & sTarget ) +void ReplaceDefines( MCONTACT hContact, tstring & sTarget ) { if (sTarget.find( _T("%nick%")) != string::npos ) { @@ -899,7 +899,7 @@ void UpdateFileToColWidth() { clFileTo1ColWidth.clear(); - for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { tstring sNick = NickFromHandle( hContact); string::size_type &rnValue = clFileTo1ColWidth[ GetFilePathFromUser( hContact) ]; if (rnValue < sNick.size()) @@ -997,7 +997,7 @@ void DisplayErrorDialog( const TCHAR *pszError, tstring& sFilePath, DBEVENTINFO // Developer : KN ///////////////////////////////////////////////////////////////////// -void ExportDBEventInfo(HCONTACT hContact, DBEVENTINFO &dbei ) +void ExportDBEventInfo(MCONTACT hContact, DBEVENTINFO &dbei ) { TCHAR szTemp[500]; tstring sFilePath = GetFilePathFromUser( hContact); @@ -1410,7 +1410,7 @@ void ExportDBEventInfo(HCONTACT hContact, DBEVENTINFO &dbei ) int nExportEvent(WPARAM wparam,LPARAM lparam) { - HCONTACT hContact = (HCONTACT)wparam; + MCONTACT hContact = (MCONTACT)wparam; HANDLE hDbEvent = (HANDLE)lparam; if ( !db_get_b(hContact,MODULE,"EnableLog",1)) return 0; @@ -1583,7 +1583,7 @@ SuperBreak: int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/) { - HCONTACT hContact = (HCONTACT)wparam; + MCONTACT hContact = (MCONTACT)wparam; HWND hInternalWindow = WindowList_Find(hInternalWindowList,hContact); if(hInternalWindow) @@ -1595,7 +1595,7 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/) tstring sFilePath = GetFilePathFromUser( hContact); // Test if there is another user using this file - for(HCONTACT hOtherContact = db_find_first();hOtherContact;hOtherContact = db_find_next(hOtherContact)) + for(MCONTACT hOtherContact = db_find_first();hOtherContact;hOtherContact = db_find_next(hOtherContact)) if (hContact != hOtherContact && sFilePath == GetFilePathFromUser( hOtherContact)) return 0; // we found another contact abort mission :-) diff --git a/plugins/Msg_Export/src/utils.h b/plugins/Msg_Export/src/utils.h index 023e32cce4..2b2a11768e 100755 --- a/plugins/Msg_Export/src/utils.h +++ b/plugins/Msg_Export/src/utils.h @@ -57,10 +57,10 @@ void ShowDebugInfo(); int nExportEvent(WPARAM wparam,LPARAM lparam); int nContactDeleted(WPARAM wparam,LPARAM lparam); -const TCHAR *NickFromHandle(HCONTACT hContact); +const TCHAR *NickFromHandle(MCONTACT hContact); -tstring __inline _DBGetStringW(HCONTACT hContact,const char *szModule,const char *szSetting, const TCHAR *pszError); -string __inline _DBGetStringA(HCONTACT hContact,const char *szModule,const char *szSetting, const char *pszError); +tstring __inline _DBGetStringW(MCONTACT hContact,const char *szModule,const char *szSetting, const TCHAR *pszError); +string __inline _DBGetStringA(MCONTACT hContact,const char *szModule,const char *szSetting, const char *pszError); void ReplaceAll( tstring &sSrc, const TCHAR *pszReplace, const tstring &sNew); void ReplaceAll( tstring &sSrc, const TCHAR *pszReplace, const TCHAR *pszNew); @@ -68,9 +68,9 @@ void ReplaceAll( tstring &sSrc, const TCHAR *pszReplace, const TCHAR *pszNew); void UpdateFileToColWidth(); bool bReadMirandaDirAndPath(); -tstring GetFilePathFromUser( HCONTACT hContact); +tstring GetFilePathFromUser( MCONTACT hContact); -void ReplaceDefines( HCONTACT hContact, tstring & sTarget); +void ReplaceDefines( MCONTACT hContact, tstring & sTarget); void ReplaceTimeVariables( tstring &sRet); bool bCreatePathToFile( tstring sFilePath); -- cgit v1.2.3