From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 08:04:30 +0000
Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat
 constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Msg_Export/src/utils.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'plugins/Msg_Export/src/utils.cpp')

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 64fbf69bb9..c7b03b5e3b 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(HANDLE hContact)
+const TCHAR* NickFromHandle(HCONTACT hContact)
 {
 	const TCHAR *psz = (const TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
 	if (psz )
@@ -279,7 +279,7 @@ const TCHAR* NickFromHandle(HANDLE hContact)
 // Developer       : KN   
 /////////////////////////////////////////////////////////////////////
 
-tstring _DBGetStringW(HANDLE hContact,const char *szModule,const char *szSetting, const TCHAR *pszError )
+tstring _DBGetStringW(HCONTACT hContact,const char *szModule,const char *szSetting, const TCHAR *pszError )
 {
 	tstring ret;
 	DBVARIANT dbv = {0};
@@ -302,7 +302,7 @@ tstring _DBGetStringW(HANDLE hContact,const char *szModule,const char *szSetting
 	return ret;
 }
 
-string _DBGetStringA(HANDLE hContact,const char *szModule,const char *szSetting, const char *pszError )
+string _DBGetStringA(HCONTACT 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( HANDLE hContact )
+tstring GetFilePathFromUser( HCONTACT hContact )
 {
 	tstring sFilePath = sExportDir + _DBGetString( hContact, MODULE, "FileName", sDefaultFile.c_str());
 
@@ -707,7 +707,7 @@ tstring GetFilePathFromUser( HANDLE hContact )
 // Developer       : KN   
 /////////////////////////////////////////////////////////////////////
 
-tstring FileNickFromHandle( HANDLE hContact)
+tstring FileNickFromHandle( HCONTACT 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( HANDLE hContact, tstring & sTarget )
+void ReplaceDefines( HCONTACT hContact, tstring & sTarget )
 {
 	if (sTarget.find( _T("%nick%")) != string::npos )
 	{
@@ -899,7 +899,7 @@ void UpdateFileToColWidth()
 {
 	clFileTo1ColWidth.clear();
 
-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (HCONTACT 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(HANDLE hContact, DBEVENTINFO &dbei )
+void ExportDBEventInfo(HCONTACT hContact, DBEVENTINFO &dbei )
 {
 	TCHAR szTemp[500];
 	tstring sFilePath = GetFilePathFromUser( hContact);
@@ -1410,7 +1410,8 @@ void ExportDBEventInfo(HANDLE hContact, DBEVENTINFO &dbei )
 
 int nExportEvent(WPARAM wparam,LPARAM lparam)
 {
-	HANDLE hContact = (HANDLE)wparam, hDbEvent = (HANDLE)lparam;
+	HCONTACT hContact = (HCONTACT)wparam;
+	HANDLE hDbEvent = (HANDLE)lparam;
 	if ( !db_get_b(hContact,MODULE,"EnableLog",1))
 		return 0;
 
@@ -1582,7 +1583,7 @@ SuperBreak:
 
 int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/)
 {
-	HANDLE hContact = (HANDLE)wparam;
+	HCONTACT hContact = (HCONTACT)wparam;
 	
 	HWND hInternalWindow = WindowList_Find(hInternalWindowList,hContact);
 	if(hInternalWindow)
@@ -1594,7 +1595,7 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/)
 	tstring sFilePath = GetFilePathFromUser( hContact);
 
 	// Test if there is another user using this file
-	for(HANDLE hOtherContact = db_find_first();hOtherContact;hOtherContact = db_find_next(hOtherContact))
+	for(HCONTACT hOtherContact = db_find_first();hOtherContact;hOtherContact = db_find_next(hOtherContact))
 		if (hContact != hOtherContact && sFilePath == GetFilePathFromUser( hOtherContact))
 			return 0; // we found another contact abort mission :-)
 
-- 
cgit v1.2.3