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

diff --git a/plugins/NewsAggregator/Src/Common.h b/plugins/NewsAggregator/Src/Common.h
index ed19e6b132..50241d3234 100644
--- a/plugins/NewsAggregator/Src/Common.h
+++ b/plugins/NewsAggregator/Src/Common.h
@@ -62,7 +62,7 @@ extern TCHAR tszRoot[MAX_PATH];
 struct ItemInfo

 {

 	HWND hwndList;

-	HANDLE hContact;

+	HCONTACT hContact;

 	int SelNumber;

 	TCHAR nick[MAX_PATH];

 	TCHAR url[MAX_PATH];

@@ -71,7 +71,7 @@ struct ItemInfo
 //============  STRUCT USED TO MAKE AN UPDATE LIST  ============

 

 struct NEWSCONTACTLIST {

-	HANDLE hContact;

+	HCONTACT hContact;

 	struct NEWSCONTACTLIST *next;

 };

 

@@ -80,7 +80,7 @@ typedef struct NEWSCONTACTLIST UPDATELIST;
 extern UPDATELIST *UpdateListHead;

 extern UPDATELIST *UpdateListTail;

 

-void UpdateListAdd(HANDLE hContact);

+void UpdateListAdd(HCONTACT hContact);

 void UpdateThreadProc(LPVOID AvatarCheck);

 void DestroyUpdateList(void);

 

@@ -119,26 +119,26 @@ INT_PTR CALLBACK DlgProcChangeFeedMenu(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 VOID CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

 VOID CALLBACK timerProc2(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

 

-BOOL IsMyContact(HANDLE hContact);

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

+BOOL IsMyContact(HCONTACT hContact);

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

 VOID CreateList(HWND hwndList);

 VOID UpdateList(HWND hwndList);

 VOID DeleteAllItems(HWND hwndList);

 time_t __stdcall DateToUnixTime(TCHAR *stamp, BOOL FeedType);

-VOID CheckCurrentFeed(HANDLE hContact);

-VOID CheckCurrentFeedAvatar(HANDLE hContact);

+VOID CheckCurrentFeed(HCONTACT hContact);

+VOID CheckCurrentFeedAvatar(HCONTACT hContact);

 TCHAR* CheckFeed(TCHAR* tszURL, HWND hwndDlg);

 void UpdateMenu(BOOL State);

 int ImportFeedsDialog();

 VOID ClearText(TCHAR *&message);

 BOOL DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal);

 int StrReplace(TCHAR *lpszOld, TCHAR *lpszNew, TCHAR *&lpszStr);

-void CreateAuthString(char *auth, HANDLE hContact, HWND hwndDlg);

+void CreateAuthString(char *auth, HCONTACT hContact, HWND hwndDlg);

 INT_PTR CALLBACK AuthenticationProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK DlgProcImportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK DlgProcExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-HANDLE GetContactByNick(const TCHAR *nick);

-HANDLE GetContactByURL(const TCHAR *url);

+HCONTACT GetContactByNick(const TCHAR *nick);

+HCONTACT GetContactByURL(const TCHAR *url);

 

 // ===============  NewsAggregator SERVICES  ================

 // Check all Feeds info