HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index de324848ae..9728ff95f2 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)

 {

-	HCONTACT hContact = PUGetContact(hWnd);

+	MCONTACT 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, HCONTACT hContact, char *msg)

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

 {

 	HWND hFocused = GetForegroundWindow();

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

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

 }

 

-FILEECHO::FILEECHO(HCONTACT Contact)

+FILEECHO::FILEECHO(MCONTACT Contact)

 {

 	hContact = Contact;

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

diff --git a/plugins/FileAsMessage/src/dialog.h b/plugins/FileAsMessage/src/dialog.h
index e8914ef5b5..962781b661 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:

-	HCONTACT hContact;

+	MCONTACT hContact;

 	HWND hDlg;

 

 	bool inSend;

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

 #endif

 

-	FILEECHO(HCONTACT Contact);

+	FILEECHO(MCONTACT Contact);

 

 	void setState(DWORD state);

 	void updateProgress();

diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 66362e9cdb..1472a5cb0e 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,(HCONTACT)wParam);

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

 	PostMessage(hwnd, WM_FE_STATUSCHANGE, 0,0);

 	//OnSkinIconsChanged(0,0);

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

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

 INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam)

 {

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

+	HWND hwnd = WindowList_Find(hFileList, (MCONTACT)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((HCONTACT)wParam);

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

 		fe->inSend = TRUE;

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

 		if(hwnd == NULL)