- 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

4 files changed, 14 insertions, 14 deletions

diff --git a/plugins/TooltipNotify/src/DbHelpers.cpp b/plugins/TooltipNotify/src/DbHelpers.cpp
index 19de8c826f..15261988de 100644
--- a/plugins/TooltipNotify/src/DbHelpers.cpp
+++ b/plugins/TooltipNotify/src/DbHelpers.cpp
@@ -11,7 +11,7 @@ static int EnumSettingsProc1(const char *pszSetting, LPARAM lParam)
 	return 0;

 }

 

-bool ModuleSettingsExists(HANDLE hContact, const char* pszModuleName)

+bool ModuleSettingsExists(HCONTACT hContact, const char* pszModuleName)

 {

 	DBCONTACTENUMSETTINGS dbces = {0};

 	dbces.szModule = pszModuleName;

@@ -28,7 +28,7 @@ static int EnumSettingsProc2(const char *pszSetting, LPARAM lParam)
 	return 0;

 }

 

-void DeleteModuleSettings(HANDLE hContact, const char* pszModuleName)

+void DeleteModuleSettings(HCONTACT hContact, const char* pszModuleName)

 {

 	SettingsList settingsList;

 	DBCONTACTENUMSETTINGS dbces = {0};

@@ -48,7 +48,7 @@ void DeleteModuleSettings(HANDLE hContact, const char* pszModuleName)
 }

 

 

-static int GetSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)

+static int GetSetting(HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)

 {

 	int rr = db_get(hContact, szModule, szSetting, dbv);

 	if (dbv->type != DBVT_UTF8)

@@ -57,7 +57,7 @@ static int GetSetting(HANDLE hContact, const char *szModule, const char *szSetti
 		return 1;

 }

 

-void RenameModule(HANDLE hContact, const char* pszOldName, const char* pszNewName)

+void RenameModule(HCONTACT hContact, const char* pszOldName, const char* pszNewName)

 {

 	SettingsList settingsList;

 	DBCONTACTENUMSETTINGS dbces = {0};

diff --git a/plugins/TooltipNotify/src/DbHelpers.h b/plugins/TooltipNotify/src/DbHelpers.h
index 374df04c05..d07b6cf26b 100644
--- a/plugins/TooltipNotify/src/DbHelpers.h
+++ b/plugins/TooltipNotify/src/DbHelpers.h
@@ -2,6 +2,6 @@
 //

 //////////////////////////////////////////////////////////////////////

 

-bool ModuleSettingsExists(HANDLE hContact, const char* pszModuleName);

-void DeleteModuleSettings(HANDLE hContact, const char* pszModuleName);

-void RenameModule(HANDLE hContact, const char* pszOldName, const char* pszNewName);

+bool ModuleSettingsExists(HCONTACT hContact, const char* pszModuleName);

+void DeleteModuleSettings(HCONTACT hContact, const char* pszModuleName);

+void RenameModule(HCONTACT hContact, const char* pszOldName, const char* pszNewName);

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 3931c5aa29..2352c0749c 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -162,7 +162,7 @@ int CTooltipNotify::ProtoContactIsTyping(WPARAM wParam, LPARAM lParam)
 	{

 		STooltipData *pTooltipData = new STooltipData;

 		pTooltipData->uiTimeout = lParam*1000;

-		pTooltipData->hContact = (HANDLE)wParam;

+		pTooltipData->hContact = (HCONTACT)wParam;

 		pTooltipData->iStatus = ID_TTNTF_STATUS_TYPING;

 

 		EndNotifyAll();

@@ -211,7 +211,7 @@ int CTooltipNotify::ProtoAck(WPARAM wParam, LPARAM lParam)
 int CTooltipNotify::ContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	if(hContact==NULL) return 0;

 	

 	bool idle = false;

@@ -798,7 +798,7 @@ void CTooltipNotify::LoadList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown
 	if (hItemUnknown && !m_sOptions.bIgnoreUnknown)

 		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItemUnknown, 1);

 

-	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 hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM) hContact, 0);

 		if (hItem && !db_get_b(hContact, MODULENAME, CONTACT_IGNORE_TTNOTIFY, m_sOptions.bIgnoreNew))

 			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItem, 1);

@@ -813,7 +813,7 @@ void CTooltipNotify::SaveList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown
 	if (hItemUnknown)

 		m_sOptions.bIgnoreUnknown = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItemUnknown, 0) ? 0 : 1);

 

-	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 hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM) hContact, 0);

 		if (hItem) {

 			BYTE bChecked = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItem, 0));

@@ -912,7 +912,7 @@ TCHAR *CTooltipNotify::StatusToString(int iStatus, TCHAR *szStatus, int iBufSize
 

 }

 

-TCHAR *CTooltipNotify::MakeTooltipString(HANDLE hContact, int iStatus, TCHAR *szString, int iBufSize)

+TCHAR *CTooltipNotify::MakeTooltipString(HCONTACT hContact, int iStatus, TCHAR *szString, int iBufSize)

 {

 	TCHAR szStatus[32];

 	StatusToString(iStatus, szStatus, SIZEOF(szStatus));

diff --git a/plugins/TooltipNotify/src/TooltipNotify.h b/plugins/TooltipNotify/src/TooltipNotify.h
index 886cacb553..58ddbf9cb9 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.h
+++ b/plugins/TooltipNotify/src/TooltipNotify.h
@@ -67,7 +67,7 @@ private:
 		CTooltip *pTooltip;

 		UINT_PTR idTimer;

 		UINT uiTimeout;

-		HANDLE hContact;

+		HCONTACT hContact;

 		int iStatus;

 	};

 

@@ -88,7 +88,7 @@ private:
 	MapTimerIdProtoIter FindProtoByTimer(UINT idTimer);

 	template<typename T> TooltipsListIter FindBy(T STooltipData::* m, const T& value);

 	TCHAR *StatusToString(int iStatus, TCHAR *szStatus, int iBufSize);

-	TCHAR *MakeTooltipString(HANDLE hContact, int iStatus, TCHAR *szString, int iBufSize);

+	TCHAR *MakeTooltipString(HCONTACT hContact, int iStatus, TCHAR *szString, int iBufSize);

 	void MigrateSettings();

 	void RegisterFonts();

 	void GetFont(int iStatus, LOGFONT* lf, COLORREF* text, COLORREF* bg);