- 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, 10 insertions, 10 deletions

diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index ee096ac8df..12e7137c67 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -49,11 +49,11 @@ static int UrlEventAdded(WPARAM wParam, LPARAM lParam)
 	SkinPlaySound("RecvUrl");

 

 	TCHAR szTooltip[256];

-	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName((HANDLE)wParam, 0));

+	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName((HCONTACT)wParam, 0));

 

 	CLISTEVENT cle = { sizeof(cle) };

 	cle.flags = CLEF_TCHAR;

-	cle.hContact = (HANDLE)wParam;

+	cle.hContact = (HCONTACT)wParam;

 	cle.hDbEvent = (HANDLE)lParam;

 	cle.hIcon = LoadSkinIcon(SKINICON_EVENT_URL);

 	cle.pszService = "SRUrl/ReadUrl";

@@ -75,7 +75,7 @@ static void RestoreUnreadUrlAlerts(void)
 	cle.pszService = "SRUrl/ReadUrl";

 	cle.flags = CLEF_TCHAR;

 

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		HANDLE hDbEvent = db_event_firstUnread(hContact);

 		while (hDbEvent) {

 			DBEVENTINFO dbei = { sizeof(dbei) };

@@ -97,7 +97,7 @@ static void RestoreUnreadUrlAlerts(void)
 static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

-	char *szProto = GetContactProto((HANDLE)wParam);

+	char *szProto = GetContactProto((HCONTACT)wParam);

 	if (lstrcmpA(cws->szModule, "CList") && (szProto == NULL || lstrcmpA(cws->szModule, szProto)))

 		return 0;

 

@@ -108,7 +108,7 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM)

 {

 	bool bEnabled = false;

-	char *szProto = GetContactProto((HANDLE)wParam);

+	char *szProto = GetContactProto((HCONTACT)wParam);

 	if (szProto != NULL)

 		if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_URLSEND)

 			bEnabled = true;

@@ -147,7 +147,7 @@ static int SRUrlShutdown(WPARAM, LPARAM)
 

 int UrlContactDeleted(WPARAM wParam, LPARAM)

 {

-	HWND h = WindowList_Find(hUrlWindowList, (HANDLE)wParam);

+	HWND h = WindowList_Find(hUrlWindowList, (HCONTACT)wParam);

 	if (h)

 		SendMessage(h, WM_CLOSE, 0, 0);

 

diff --git a/src/core/stdurl/url.h b/src/core/stdurl/url.h
index 482ddf4a01..075f14ecbb 100644
--- a/src/core/stdurl/url.h
+++ b/src/core/stdurl/url.h
@@ -29,12 +29,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DDEMESSAGETIMEOUT   1000

 

 struct UrlRcvData {

-	HANDLE hContact;

+	HCONTACT hContact;

 	HANDLE hDbEvent;

 };

 

 struct UrlSendData {

-	HANDLE hContact;

+	HCONTACT hContact;

 	HANDLE hSendId;

 	HANDLE hAckEvent;

 	char *sendBuffer;

diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index 907720845c..a82ef7510c 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -28,7 +28,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 extern HANDLE hUrlWindowList;

 

-static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact)

+static void sttUpdateTitle(HWND hwndDlg, HCONTACT hContact)

 {

 	TCHAR newtitle[256], oldtitle[256];

 	TCHAR *szStatus, *contactName, *pszNewTitleStart = TranslateT("Send URL to");

@@ -469,7 +469,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_LIMITTEXT, 450, 0);

 		dat = (struct UrlSendData*)mir_alloc(sizeof(struct UrlSendData));

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

-		dat->hContact = (HANDLE)lParam;

+		dat->hContact = (HCONTACT)lParam;

 		dat->hAckEvent = NULL;

 		dat->hSendId = NULL;

 		dat->sendBuffer = NULL;