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/AvatarHistory/src/AvatarDlg.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'plugins/AvatarHistory/src/AvatarDlg.cpp')

diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp
index 46c84d363d..82a987b0b5 100644
--- a/plugins/AvatarHistory/src/AvatarDlg.cpp
+++ b/plugins/AvatarHistory/src/AvatarDlg.cpp
@@ -23,22 +23,22 @@ Avatar History Plugin
 HGENMENU hMenu = NULL; 
 DWORD WINAPI AvatarDialogThread(LPVOID param);
 static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM lParam);
-int ShowSaveDialog(HWND hwnd, TCHAR* fn,HANDLE hContact = NULL);
+int ShowSaveDialog(HWND hwnd, TCHAR* fn,HCONTACT hContact = NULL);
 
 BOOL ProtocolEnabled(const char *proto);
-int FillAvatarListFromDB(HWND list, HANDLE hContact);
-int FillAvatarListFromFolder(HWND list, HANDLE hContact);
-int FillAvatarListFromFiles(HWND list, HANDLE hContact);
+int FillAvatarListFromDB(HWND list, HCONTACT hContact);
+int FillAvatarListFromFolder(HWND list, HCONTACT hContact);
+int FillAvatarListFromFiles(HWND list, HCONTACT hContact);
 int CleanupAvatarPic(HWND hwnd);
 bool UpdateAvatarPic(HWND hwnd);
-TCHAR * GetContactFolder(TCHAR *fn, HANDLE hContact);
+TCHAR * GetContactFolder(TCHAR *fn, HCONTACT hContact);
 BOOL ResolveShortcut(TCHAR *shortcut, TCHAR *file);
 
 static INT_PTR ShowDialogSvc(WPARAM wParam, LPARAM lParam);
 
 struct AvatarDialogData
 {
-	HANDLE hContact;
+	HCONTACT hContact;
 	TCHAR fn[MAX_PATH];
 	HWND parent;
 };
@@ -65,7 +65,7 @@ public:
 	TCHAR *filelink;
 };
 
-int OpenAvatarDialog(HANDLE hContact, char* fn)
+int OpenAvatarDialog(HCONTACT hContact, char* fn)
 {
 	HWND hAvatarWindow = WindowList_Find(hAvatarWindowsList, hContact);
 	if (hAvatarWindow)
@@ -222,7 +222,7 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l
 			DestroyMenu(menu);
 
 			ListEntry *le = (ListEntry*) SendMessage(hwndList, LB_GETITEMDATA, pos, 0);
-			HANDLE hContact = (HANDLE) GetWindowLongPtr(hwnd, GWLP_USERDATA);
+			HCONTACT hContact = (HCONTACT) GetWindowLongPtr(hwnd, GWLP_USERDATA);
 			switch(ret) {
 			case ID_AVATARLISTPOPUP_SAVEAS:
 				ShowSaveDialog(hwnd, le->filename, hContact);
@@ -302,7 +302,7 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l
 		switch(LOWORD(wParam)) {
 		case IDOK:
 			if (HIWORD(wParam) == BN_CLICKED) {
-				HANDLE hContact = (HANDLE) GetWindowLongPtr(hwnd, GWLP_USERDATA);
+				HCONTACT hContact = (HCONTACT) GetWindowLongPtr(hwnd, GWLP_USERDATA);
 				db_set_b(hContact, MODULE_NAME, "AvatarPopups", (BYTE) IsDlgButtonChecked(hwnd, IDC_POPUPUSER));
 				db_set_b(hContact, MODULE_NAME, "LogToDisk", (BYTE) IsDlgButtonChecked(hwnd, IDC_LOGUSER));
 				db_set_b(hContact, MODULE_NAME, "LogToHistory", (BYTE) IsDlgButtonChecked(hwnd, IDC_HISTORYUSER));
@@ -324,7 +324,7 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l
 		case IDC_OPENFOLDER:
 			if (HIWORD(wParam) == BN_CLICKED && opts.log_per_contact_folders) {
 				TCHAR avfolder[MAX_PATH];
-				HANDLE hContact = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+				HCONTACT hContact = (HCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 				GetContactFolder(avfolder, hContact);
 				ShellExecute(NULL, db_get_b(NULL, MODULE_NAME, "OpenFolderMethod", 0) ? _T("explore") : _T("open"), avfolder, NULL, NULL, SW_SHOWNORMAL);
 				return TRUE;
@@ -373,7 +373,7 @@ int AddFileToList(TCHAR *path,TCHAR *lnk,TCHAR *filename, HWND list)
 	return max_pos;
 }
 
-int FillAvatarListFromFiles(HWND list, HANDLE hContact)
+int FillAvatarListFromFiles(HWND list, HCONTACT hContact)
 {
 	int max_pos = 0;
 	TCHAR dir[MAX_PATH], path[MAX_PATH];
@@ -400,7 +400,7 @@ int FillAvatarListFromFiles(HWND list, HANDLE hContact)
 	return 0;
 }
 
-int FillAvatarListFromFolder(HWND list, HANDLE hContact)
+int FillAvatarListFromFolder(HWND list, HCONTACT hContact)
 {
 	int max_pos = 0;
 	TCHAR dir[MAX_PATH], path[MAX_PATH];
@@ -429,7 +429,7 @@ int FillAvatarListFromFolder(HWND list, HANDLE hContact)
 	return 0;
 }
 
-int FillAvatarListFromDB(HWND list, HANDLE hContact)
+int FillAvatarListFromDB(HWND list, HCONTACT hContact)
 {
 	int max_pos = 0;
 	BYTE blob[2048];
@@ -513,7 +513,7 @@ int CleanupAvatarPic(HWND hwnd)
 
 int PreBuildContactMenu(WPARAM wParam,LPARAM lParam) 
 {
-	char *proto = GetContactProto((HANDLE)wParam);
+	char *proto = GetContactProto((HCONTACT)wParam);
 	Menu_ShowItem(hMenu, ProtocolEnabled(proto));
 	return 0;
 }
@@ -534,12 +534,12 @@ void InitMenuItem()
 
 static INT_PTR ShowDialogSvc(WPARAM wParam, LPARAM lParam)
 {
-	OpenAvatarDialog((HANDLE)wParam, (char*)lParam);
+	OpenAvatarDialog((HCONTACT)wParam, (char*)lParam);
 	return 0;
 }
 
 
-int ShowSaveDialog(HWND hwnd, TCHAR* fn, HANDLE hContact)
+int ShowSaveDialog(HWND hwnd, TCHAR* fn, HCONTACT hContact)
 {
 	TCHAR filter[MAX_PATH];
 	TCHAR file[MAX_PATH];
-- 
cgit v1.2.3