From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - 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 --- .../UserInfoEx/src/ex_import/classExImContactBase.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/UserInfoEx/src/ex_import/classExImContactBase.h') diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h index 377b341c3e..c9bb3fee24 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h @@ -36,7 +36,7 @@ protected: LPSTR _pszUIDKey; DWORD _dbvUIDHash; DBVARIANT _dbvUID; - HANDLE _hContact; + HCONTACT _hContact; BYTE _isNewContact; // is this contact a new one? HANDLE findHandle(); @@ -52,7 +52,7 @@ public: // __inline LPCSTR ampro() const { return mir_strcmp(_pszAMPro,"")? _pszAMPro : NULL; } // __inline LPCSTR uidk() const { return mir_strcmp(_pszUIDKey,"")? _pszUIDKey : NULL; } __inline DBVARIANT& uid() { return _dbvUID; } - __inline HANDLE handle() const { return _hContact; } + __inline HCONTACT handle() const { return _hContact; } __inline void disp(LPCSTR val) { _pszDisp = val ? mir_strdup(val): NULL; } __inline void group(LPCSTR val) { _pszGroup = val ? mir_strdup(val): NULL; } @@ -77,16 +77,16 @@ public: mir_free(temp); } - BYTE isHandle(HANDLE hContact); - BYTE isMeta() const; + BYTE isHandle(HCONTACT hContact); + BYTE isMeta() const; - LPSTR uid2String(BYTE bPrependType); + LPSTR uid2String(BYTE bPrependType); - BYTE fromDB(HANDLE hContact); - BYTE fromIni(LPSTR& row); + BYTE fromDB(HCONTACT hContact); + BYTE fromIni(LPSTR& row); - HANDLE toDB(); - void toIni(FILE* file, int modCount); + HCONTACT toDB(); + void toIni(FILE* file, int modCount); - BYTE operator = (HANDLE hContact) { return fromDB(hContact); } + BYTE operator = (HCONTACT hContact) { return fromDB(hContact); } }; -- cgit v1.2.3