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

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
index 3fbab056e7..2507d83b61 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
@@ -59,9 +59,9 @@ public:
 

 	size_t GetTokenFirst(const CHAR delim, CLineBuffer * pBuf);

 	size_t GetTokenNext(const CHAR delim, CLineBuffer * pBuf);

-	int	 DBWriteTokenFirst(HANDLE hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim);

-	int	 DBWriteTokenNext(HANDLE hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim);

-	int	 DBWriteSettingString(HANDLE hContact, const CHAR* pszModule, const CHAR* pszSetting);

+	int	 DBWriteTokenFirst(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim);

+	int	 DBWriteTokenNext(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim);

+	int	 DBWriteSettingString(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting);

 };

 

 class CVCardFileVCF

@@ -69,7 +69,7 @@ class CVCardFileVCF
 private:

 	CLineBuffer		 _clVal;

 	FILE			*_pFile;

-	HANDLE			 _hContact;

+	HCONTACT		 _hContact;

 	const CHAR		*_pszBaseProto;

 	WORD			 _cbRew;

 	BYTE			 _useUtf8;

@@ -87,7 +87,7 @@ private:
 public:

 	CVCardFileVCF();

 

-	BYTE Open(HANDLE hContact, LPCSTR pszFileName, LPCSTR pszMode);

+	BYTE Open(HCONTACT hContact, LPCSTR pszFileName, LPCSTR pszMode);

 	void	Close(void);

 	BYTE Export(BYTE bExportUtf);

 	BYTE Import();