- 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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/core/stdfile/file.h b/src/core/stdfile/file.h
index 80f8b26d2b..aa390a774a 100644
--- a/src/core/stdfile/file.h
+++ b/src/core/stdfile/file.h
@@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define M_PRESHUTDOWN		   (WM_USER+201)

 

 struct FileSendData {

-	HANDLE hContact;

+	HCONTACT hContact;

 	const TCHAR **ppFiles;

 };

 

@@ -46,7 +46,7 @@ struct FileSendData {
 struct FileDlgData {

 	HWND hwndTransfer;

 	HANDLE fs;

-	HANDLE hContact;

+	HCONTACT hContact;

 	HANDLE hDbEvent;

 	HANDLE hNotifyEvent;

 	TCHAR **files;

@@ -85,7 +85,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 void RemoveInvalidFilenameChars(TCHAR *tszString);

 void RemoveInvalidPathChars(TCHAR *tszString);

-void GetContactReceivedFilesDir(HANDLE hContact, TCHAR *szDir, int cchDir, BOOL substVars);

+void GetContactReceivedFilesDir(HCONTACT hContact, TCHAR *szDir, int cchDir, BOOL substVars);

 void GetReceivedFilesDir(TCHAR *szDir, int cchDir);

 int BrowseForFolder(HWND hwnd, TCHAR *szPath);

 //fileexistsdlg.c

@@ -113,4 +113,4 @@ HWND FtMgr_AddTransfer(struct FileDlgData *dat);
 

 void FreeFileDlgData(FileDlgData* dat);

 

-TCHAR *GetContactID(HANDLE hContact);

+TCHAR *GetContactID(HCONTACT hContact);