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

diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h
index 0130a8e383..27fd3f82c7 100644
--- a/plugins/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
@@ -226,7 +226,7 @@ struct MYOPTIONS
 

 	// other misc stuff

 	TCHAR Default[64];

-	HANDLE DefStn;

+	HCONTACT DefStn;

 };

 

 void DestroyOptions(void);

@@ -234,7 +234,7 @@ void DestroyOptions(void);
 //============  STRUCT USED TO MAKE AN UPDATE LIST  ============

 

 struct WCONTACTLIST {

-	HANDLE hContact;

+	HCONTACT hContact;

 	struct WCONTACTLIST *next;

 };

 

@@ -395,7 +395,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 

 int ContactDeleted(WPARAM wParam,LPARAM lParam);

 

-BOOL IsMyContact(HANDLE hContact);

+BOOL IsMyContact(HCONTACT hContact);

 

 // functions in weather_conv.c

 BOOL is_number(char *s);

@@ -422,10 +422,10 @@ void GetID(TCHAR *pszID);
 TCHAR *GetError(int code);

 

 // functions in weather_data.c

-void GetStationID(HANDLE hContact, TCHAR* id, size_t idlen);

-WEATHERINFO LoadWeatherInfo(HANDLE Change);

-int DBGetData(HANDLE hContact, char *setting, DBVARIANT *dbv);

-int DBGetStaticString(HANDLE hContact, const char *szModule, const char *valueName, TCHAR *dest, size_t dest_len);

+void GetStationID(HCONTACT hContact, TCHAR* id, size_t idlen);

+WEATHERINFO LoadWeatherInfo(HCONTACT Change);

+int DBGetData(HCONTACT hContact, char *setting, DBVARIANT *dbv);

+int DBGetStaticString(HCONTACT hContact, const char *szModule, const char *valueName, TCHAR *dest, size_t dest_len);

 

 void EraseAllInfo(void);

 

@@ -438,7 +438,7 @@ void wSetData(WCHAR **Data, const WCHAR *Value);
 void wfree(char **Data);

 void wfree(WCHAR **Data);

 

-void DBDataManage(HANDLE hContact, WORD Mode, WPARAM wParam, LPARAM lParam);

+void DBDataManage(HCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam);

 

 // functions in weather_http.c

 int InternetDownloadFile (char *szUrl, char *cookie, TCHAR** szData);

@@ -498,12 +498,12 @@ INT_PTR WeatherLoadIcon(WPARAM wParam, LPARAM lParam);
 void UpdateMenu(BOOL State);

 void UpdatePopupMenu(BOOL State);

 void AddMenuItems();

-void AvatarDownloaded(HANDLE hContact);

+void AvatarDownloaded(HCONTACT hContact);

 

 // functions in weather_update.c

-int UpdateWeather(HANDLE hContact);

+int UpdateWeather(HCONTACT hContact);

 

-int RetrieveWeather(HANDLE hContact, WEATHERINFO *winfo);

+int RetrieveWeather(HCONTACT hContact, WEATHERINFO *winfo);

 

 void UpdateAll(BOOL AutoUpdate, BOOL RemoveOld);

 void UpdateThreadProc(LPVOID hWnd);

@@ -512,7 +512,7 @@ INT_PTR UpdateAllInfo(WPARAM wParam,LPARAM lParam);
 INT_PTR UpdateSingleRemove(WPARAM wParam,LPARAM lParam);

 INT_PTR UpdateAllRemove(WPARAM wParam,LPARAM lParam);

 

-int GetWeatherData(HANDLE hContact);

+int GetWeatherData(HCONTACT hContact);

 

 void CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

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

@@ -522,8 +522,8 @@ void InitMwin(void);
 void DestroyMwin(void);

 INT_PTR Mwin_MenuClicked(WPARAM wParam, LPARAM lParam);

 int BuildContactMenu(WPARAM wparam, LPARAM lparam);

-void UpdateMwinData(HANDLE hContact);

-void removeWindow(HANDLE hContact);

+void UpdateMwinData(HCONTACT hContact);

+void removeWindow(HCONTACT hContact);

 

 // functions in weather_userinfo.c

 int UserInfoInit(WPARAM wParam, LPARAM lParam);

@@ -535,7 +535,7 @@ INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 int BriefInfo(WPARAM wParam, LPARAM lParam);

 INT_PTR BriefInfoSvc(WPARAM wParam, LPARAM lParam);

-void LoadBriefInfoText(HWND hwndDlg, HANDLE hContact);

+void LoadBriefInfoText(HWND hwndDlg, HCONTACT hContact);

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

 

 void InitIcons(void);