- 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

1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/NewsAggregator/Src/Utils.cpp b/plugins/NewsAggregator/Src/Utils.cpp
index ff794bd369..c361b08485 100644
--- a/plugins/NewsAggregator/Src/Utils.cpp
+++ b/plugins/NewsAggregator/Src/Utils.cpp
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.
 HANDLE hNetlibUser = NULL, hNetlibHttp;

 BOOL UpdateListFlag = FALSE;

 

-BOOL IsMyContact(HANDLE hContact)

+BOOL IsMyContact(HCONTACT hContact)

 {

 	const char *szProto = GetContactProto(hContact);

 	return szProto != NULL && strcmp(MODULE, szProto) == 0;

@@ -58,7 +58,7 @@ static void arrayToHex(BYTE *data, size_t datasz, char *res)
 	*resptr = '\0';

 } 

 

-VOID GetNewsData(TCHAR *tszUrl, char **szData, HANDLE hContact, HWND hwndDlg)

+VOID GetNewsData(TCHAR *tszUrl, char **szData, HCONTACT hContact, HWND hwndDlg)

 {

 	NETLIBHTTPREQUEST nlhr = {0};

 

@@ -155,7 +155,7 @@ VOID UpdateList(HWND hwndList)
 	// Initialize LVITEM members that are common to all

 	// items.

 	int i = 0;

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

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

 		UpdateListFlag = TRUE;

 		lvI.mask = LVIF_TEXT;

 		lvI.iSubItem = 0;

@@ -562,9 +562,9 @@ VOID ClearText(TCHAR *&message)
 	CoUninitialize();

 }

 

-HANDLE GetContactByNick(const TCHAR *nick)

+HCONTACT GetContactByNick(const TCHAR *nick)

 {

-	HANDLE hContact = NULL;

+	HCONTACT hContact = NULL;

 

 	for (hContact = db_find_first(MODULE); hContact; hContact = db_find_next(hContact, MODULE)) {

 		ptrW contactNick(::db_get_wsa(hContact, MODULE, "Nick"));

@@ -574,9 +574,9 @@ HANDLE GetContactByNick(const TCHAR *nick)
 	return hContact;

 }

 

-HANDLE GetContactByURL(const TCHAR *url)

+HCONTACT GetContactByURL(const TCHAR *url)

 {

-	HANDLE hContact = NULL;

+	HCONTACT hContact = NULL;

 

 	for (hContact = db_find_first(MODULE); hContact; hContact = db_find_next(hContact, MODULE)) {

 		ptrW contactURL(::db_get_wsa(hContact, MODULE, "URL"));