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/Sessions/Src/Main.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/Sessions/Src/Main.cpp')

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 2180386f89..475e00ad62 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -44,9 +44,9 @@ HWND g_hSDlg;
 BOOL DONT = FALSE;
 BOOL StartUp, isLastTRUE = FALSE, g_mode,bSC = FALSE;
 
-HANDLE session_list[255] = {0};
-HANDLE user_session_list[255] = {0};
-HANDLE session_list_recovered[255];
+HCONTACT session_list[255] = { 0 };
+HCONTACT user_session_list[255] = { 0 };
+HCONTACT session_list_recovered[255];
 
 int count = 0;
 unsigned int ses_count = 0;
@@ -227,7 +227,7 @@ INT_PTR CALLBACK SaveSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 						GetWindowText(GetDlgItem(hdlg, IDC_LIST), szUserSessionName, SIZEOF(szUserSessionName));
 						szUserSessionName[lenght+1]='\0';
 						if (IsDlgButtonChecked(hdlg,IDC_SELCONTACTS)&&bSC) {
-							for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+							for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 								BYTE res =(BYTE)SendMessage(hClistControl, CLM_GETCHECKMARK, SendMessage(hClistControl, CLM_FINDCONTACT, (WPARAM)hContact, 0), 0);
 								if (res) {
 									user_session_list[i] = hContact;
@@ -443,13 +443,13 @@ INT_PTR CloseCurrentSession(WPARAM wparam,LPARAM lparam)
 	while(session_list[0]!=0)
 	{
 		mwid.cbSize = sizeof(MessageWindowInputData);
-		mwid.hContact=session_list[i];
-		mwid.uFlags=MSG_WINDOW_UFLAG_MSG_BOTH;
+		mwid.hContact = session_list[i];
+		mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
 
 		mwd.cbSize = sizeof(MessageWindowData);
 		mwd.hContact = mwid.hContact;
-		mwd.uFlags=MSG_WINDOW_UFLAG_MSG_BOTH;
-		CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid,(LPARAM)&mwd);
+		mwd.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
+		CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd);
 
 		if (g_mode)
 		{
@@ -468,7 +468,7 @@ int SaveSessionHandles(WPARAM wparam,LPARAM lparam)
 		return 1;
 
 	int k=0;
-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		if ((k=CheckForDuplicate(session_list,hContact)) != -1 && !(g_bExclHidden && !CheckContactVisibility(hContact))) {
 			AddSessionMark(hContact,lparam,'1');
 			AddInSessionOrder(hContact,lparam,k,1);
@@ -597,8 +597,8 @@ int LoadSession(WPARAM wparam,LPARAM lparam)
 {
 	int dup=0;
 	int hidden[255]={'0'};
-	HANDLE hContact;
-	HANDLE session_list_t[255]={0};
+	HCONTACT hContact;
+	HCONTACT session_list_t[255] = { 0 };
 	int mode=0;
 	int i=0,j=0;
 	if ((UINT)lparam>=ses_limit&&lparam!=256)
@@ -672,7 +672,7 @@ int LoadSession(WPARAM wparam,LPARAM lparam)
 int DelUserDefSession(int ses_count)
 {
 	int i=0;
-	HANDLE hContact;
+	HCONTACT hContact;
 	char szSessionName[256]={0};
 	TCHAR *szSessionNameBuf=NULL;
 
@@ -713,7 +713,7 @@ int DelUserDefSession(int ses_count)
 int DeleteAutoSession(int ses_count)
 {
 	int i=0;
-	HANDLE hContact;
+	HCONTACT hContact;
 	char szSessionName[256]={0};
 
 	TCHAR *szSessionNameBuf=NULL;
@@ -963,7 +963,7 @@ extern "C" __declspec(dllexport) int Load(void)
 		int i=0;
 		ZeroMemory(session_list_recovered, sizeof(session_list_recovered));
 
-		for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
+		for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
 			if (db_get_b(hContact, MODNAME, "wasInLastSession", 0))
 				session_list_recovered[i++] = hContact;
 	}
-- 
cgit v1.2.3