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

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 4415e69a78..f52a7e44a4 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -83,7 +83,7 @@ static VOID NTAPI ShowContactMenu(ULONG_PTR wParam)
 

 void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata)

 {

-	HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETCONTACT, (WPARAM)hWnd, 0);

+	HCONTACT hContact = (HCONTACT)CallService(MS_POPUP_GETCONTACT, (WPARAM)hWnd, 0);

 	switch (Action) {

 	case PCA_OPENMESSAGEWND: // open message window

 		if (hContact && hContact != INVALID_HANDLE_VALUE)

@@ -201,7 +201,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 	if (lstrcmpA(cws->szSetting, DB_MIRVER))

 		return 0;

 

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	SHOWPOPUP_DATA sd = {0};

 	char *szProto = GetContactProto(hContact);

 	if (g_PreviewOptPage)

@@ -231,7 +231,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 		PopupOptPage.DBToMem();

 	}

 

-	HANDLE hContactOrMeta = (hContact && bMetaContactsExists) ? (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0) : hContact;

+	HCONTACT hContactOrMeta = (hContact && bMetaContactsExists) ? (HCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0) : hContact;

 	if (!hContactOrMeta)

 		hContactOrMeta = hContact;

 

diff --git a/plugins/ClientChangeNotify/src/Common.h b/plugins/ClientChangeNotify/src/Common.h
index 2869333d1c..f9ce032674 100644
--- a/plugins/ClientChangeNotify/src/Common.h
+++ b/plugins/ClientChangeNotify/src/Common.h
@@ -138,7 +138,7 @@ struct PLUGIN_DATA
 

 struct SHOWPOPUP_DATA

 {

-	HANDLE hContact;

+	HCONTACT hContact;

 	TCString OldMirVer;

 	TCString MirVer;

 	COptPage *PopupOptPage;

diff --git a/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp b/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp
index de3e26d238..52e4f69295 100644
--- a/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp
+++ b/plugins/ClientChangeNotify/src/CommonLibs/CString.cpp
@@ -272,19 +272,19 @@ template class TString<TCHAR>;
 template class TString<char>;

 template class TString<WCHAR>;

 

-CString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue)

+CString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue)

 {

 	ptrA p( db_get_sa(hContact, szModule, szSetting));

 	return CString(p == NULL ? szDefaultValue : p);

 }

 

-TCString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue)

+TCString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue)

 {

 	ptrT p( db_get_tsa(hContact, szModule, szSetting));

 	return TCString(p == NULL ? szDefaultValue : p);

 }

 

-TCString DBGetContactSettingAsString(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue)

+TCString DBGetContactSettingAsString(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue)

 { // also converts numeric values to a string

 	DBVARIANT dbv = {0};

 	int iRes = db_get_ws(hContact, szModule, szSetting, &dbv);

diff --git a/plugins/ClientChangeNotify/src/CommonLibs/CString.h b/plugins/ClientChangeNotify/src/CommonLibs/CString.h
index fc81efed22..c1f555c72a 100644
--- a/plugins/ClientChangeNotify/src/CommonLibs/CString.h
+++ b/plugins/ClientChangeNotify/src/CommonLibs/CString.h
@@ -163,10 +163,10 @@ __inline CHARARRAY WCHAR2UTF8(WCString Str)
 

 

 #undef db_get_s

-CString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue);

-TCString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue);

-int db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);

-TCString DBGetContactSettingAsString(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); // also converts numeric values to a string

+CString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const char *szDefaultValue);

+TCString db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue);

+int db_get_s(HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);

+TCString DBGetContactSettingAsString(HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); // also converts numeric values to a string

 

 // various string helpers. their return values are valid only while the class is visible

 class UTF8Encode