- 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

3 files changed, 13 insertions, 13 deletions

diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index ba9e2ec7c2..de324848ae 100644
--- a/plugins/FileAsMessage/src/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
@@ -64,7 +64,7 @@ char cCmdList[CMD_COUNT] =
 

 static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = PUGetContact(hWnd);

+	HCONTACT hContact = PUGetContact(hWnd);

 	HWND hDlg = (HWND)PUGetPluginData(hWnd);

 /*

 	if(hContact)

@@ -112,7 +112,7 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 //

 // Just create simple Popup for specified contact

 //

-void MakePopupMsg(HWND hDlg, HANDLE hContact, char *msg)

+void MakePopupMsg(HWND hDlg, HCONTACT hContact, char *msg)

 {

 	HWND hFocused = GetForegroundWindow();

 	if(hDlg == hFocused || hDlg == GetParent(hFocused)) return;

@@ -121,7 +121,7 @@ void MakePopupMsg(HWND hDlg, HANDLE hContact, char *msg)
 	//The text for the second line. You could even make something like: char lpzText[128]; lstrcpy(lpzText, "Hello world!"); It's your choice.

 	//

 	POPUPDATA ppd = { 0 };

-	ppd.lchContact = (HANDLE)hContact;

+	ppd.lchContact = hContact;

 	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SMALLICON));

 	lstrcpy(ppd.lpzContactName, (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0));

 	lstrcpy(ppd.lpzText, msg);

@@ -156,7 +156,7 @@ int RetrieveFileSize(char *filename)
 	return handle;

 }

 

-FILEECHO::FILEECHO(HANDLE Contact)

+FILEECHO::FILEECHO(HCONTACT Contact)

 {

 	hContact = Contact;

 	dwSendInterval = db_get_dw(NULL, SERVICE_NAME, "SendDelay", 6000);

@@ -469,7 +469,7 @@ void FILEECHO::incomeRequest(char *param)
 

 	SkinPlaySound("RecvFile");

 	int AutoMin = db_get_b(NULL,"SRFile","AutoMin",0);

-	if(db_get_b(NULL,"SRFile","AutoAccept",0) && !db_get_b((HANDLE)hContact,"CList","NotOnList",0))

+	if(db_get_b(NULL,"SRFile","AutoAccept",0) && !db_get_b(hContact,"CList","NotOnList",0))

 	{

 		PostMessage(hDlg, WM_COMMAND, IDC_PLAY, 0);

 		if(AutoMin)

diff --git a/plugins/FileAsMessage/src/dialog.h b/plugins/FileAsMessage/src/dialog.h
index 49099703de..e8914ef5b5 100644
--- a/plugins/FileAsMessage/src/dialog.h
+++ b/plugins/FileAsMessage/src/dialog.h
@@ -54,7 +54,7 @@ extern char cFECmd[CMD_COUNT];
 struct FILEECHO

 {

 public:

-	HANDLE hContact;

+	HCONTACT hContact;

 	HWND hDlg;

 

 	bool inSend;

@@ -90,7 +90,7 @@ public:
 	uint overhead;

 #endif

 

-	FILEECHO(HANDLE Contact);

+	FILEECHO(HCONTACT Contact);

 

 	void setState(DWORD state);

 	void updateProgress();

diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 247072897c..66362e9cdb 100644
--- a/plugins/FileAsMessage/src/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
@@ -54,7 +54,7 @@ int OnSettingChanged(WPARAM wParam,LPARAM lParam)
 {

 	DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;

 

-	HWND hwnd = WindowList_Find(hFileList,(HANDLE)wParam);

+	HWND hwnd = WindowList_Find(hFileList,(HCONTACT)wParam);

 	PostMessage(hwnd, WM_FE_STATUSCHANGE, 0,0);

 	//OnSkinIconsChanged(0,0);

 	//PostMessage(hwnd, WM_FE_SKINCHANGE, 0,0);

@@ -66,7 +66,7 @@ INT_PTR OnRecvFile(WPARAM wParam, LPARAM lParam)
 {

 	CLISTEVENT *clev = (CLISTEVENT*)lParam;

 

-	HWND hwnd = WindowList_Find(hFileList,(HANDLE)clev->hContact);

+	HWND hwnd = WindowList_Find(hFileList, clev->hContact);

 	if(IsWindow(hwnd))

 	{

 		ShowWindow(hwnd, SW_SHOWNORMAL);

@@ -94,7 +94,7 @@ INT_PTR OnRecvFile(WPARAM wParam, LPARAM lParam)
 

 INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam)

 {

-	HWND hwnd = WindowList_Find(hFileList,(HANDLE)wParam);

+	HWND hwnd = WindowList_Find(hFileList, (HCONTACT)wParam);

 	if(IsWindow(hwnd))

 	{

 		SetForegroundWindow(hwnd);

@@ -103,7 +103,7 @@ INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam)
 	else

 	{

 		if(hwnd != 0) WindowList_Remove(hFileList, hwnd);

-		FILEECHO *fe = new FILEECHO((HANDLE)wParam);

+		FILEECHO *fe = new FILEECHO((HCONTACT)wParam);

 		fe->inSend = TRUE;

 		hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc, (LPARAM)fe);

 		if(hwnd == NULL)

@@ -125,11 +125,11 @@ INT_PTR OnRecvMessage(WPARAM wParam, LPARAM lParam)
 	if(strncmp(ppre->szMessage, szServicePrefix, strlen(szServicePrefix)))

 		return CallService(MS_PROTO_CHAINRECV, wParam, lParam);

 

-	HWND hwnd = WindowList_Find(hFileList, (HANDLE)pccsd->hContact);

+	HWND hwnd = WindowList_Find(hFileList, pccsd->hContact);

 	if(!IsWindow(hwnd))

 	{

 		if(hwnd != 0) WindowList_Remove(hFileList, hwnd);

-		FILEECHO *fe = new FILEECHO((HANDLE)pccsd->hContact);

+		FILEECHO *fe = new FILEECHO(pccsd->hContact);

 		fe->inSend = FALSE;

 		hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc, (LPARAM)fe);

 		if(hwnd == NULL)