- 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

2 files changed, 33 insertions, 33 deletions

diff --git a/plugins/Dbx_tree/src/Compatibility.cpp b/plugins/Dbx_tree/src/Compatibility.cpp
index 18b9b6571e..bc42386664 100644
--- a/plugins/Dbx_tree/src/Compatibility.cpp
+++ b/plugins/Dbx_tree/src/Compatibility.cpp
@@ -774,13 +774,13 @@ STDMETHODIMP_(BOOL) CDataBase::MarkEventRead(MCONTACT contactID, HANDLE hDbEvent
 	return res;

 }

 

-STDMETHODIMP_(HANDLE) CDataBase::GetEventContact(HANDLE hDbEvent)

+STDMETHODIMP_(MCONTACT) CDataBase::GetEventContact(HANDLE hDbEvent)

 {

 	TDBTEntityHandle res = DBEventGetEntity((WPARAM)hDbEvent, 0);

 	if (res == getEntities().getRootEntity())

 		res = 0;

 

-	return (HANDLE)res;

+	return res;

 }

 

 STDMETHODIMP_(HANDLE) CDataBase::FindFirstEvent(MCONTACT contactID)

diff --git a/plugins/Dbx_tree/src/DataBase.h b/plugins/Dbx_tree/src/DataBase.h
index b19ceebb1c..6f3cc07b6e 100644
--- a/plugins/Dbx_tree/src/DataBase.h
+++ b/plugins/Dbx_tree/src/DataBase.h
@@ -193,40 +193,40 @@ public:     // services
 	void CreateDbService(const char *szServiceName, DbServiceFunc pFunc);

 

 protected:  // to be compatible with the standard Miranda databases

-	STDMETHODIMP_(void)   SetCacheSafetyMode(BOOL);

+	STDMETHODIMP_(void)     SetCacheSafetyMode(BOOL);

 

-	STDMETHODIMP_(LONG)   GetContactCount(void);

+	STDMETHODIMP_(LONG)     GetContactCount(void);

 	STDMETHODIMP_(MCONTACT) FindFirstContact(const char* szProto = NULL);

 	STDMETHODIMP_(MCONTACT) FindNextContact(MCONTACT contactID, const char* szProto = NULL);

-	STDMETHODIMP_(LONG)   DeleteContact(MCONTACT contactID);

-	STDMETHODIMP_(HANDLE) AddContact(void);

-	STDMETHODIMP_(BOOL)   IsDbContact(MCONTACT contactID);

-

-	STDMETHODIMP_(LONG)   GetEventCount(MCONTACT contactID);

-	STDMETHODIMP_(HANDLE) AddEvent(MCONTACT contactID, DBEVENTINFO *dbe);

-	STDMETHODIMP_(BOOL)   DeleteEvent(MCONTACT contactID, HANDLE hDbEvent);

-	STDMETHODIMP_(LONG)   GetBlobSize(HANDLE hDbEvent);

-	STDMETHODIMP_(BOOL)   GetEvent(HANDLE hDbEvent, DBEVENTINFO *dbe);

-	STDMETHODIMP_(BOOL)   MarkEventRead(MCONTACT contactID, HANDLE hDbEvent);

-	STDMETHODIMP_(HANDLE) GetEventContact(HANDLE hDbEvent);

-	STDMETHODIMP_(HANDLE) FindFirstEvent(MCONTACT contactID);

-	STDMETHODIMP_(HANDLE) FindFirstUnreadEvent(MCONTACT contactID);

-	STDMETHODIMP_(HANDLE) FindLastEvent(MCONTACT contactID);

-	STDMETHODIMP_(HANDLE) FindNextEvent(HANDLE hDbEvent);

-	STDMETHODIMP_(HANDLE) FindPrevEvent(HANDLE hDbEvent);

-

-	STDMETHODIMP_(BOOL)   EnumModuleNames(DBMODULEENUMPROC pFunc, void *pParam);

-

-	STDMETHODIMP_(BOOL)   GetContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv);

-	STDMETHODIMP_(BOOL)   GetContactSettingStr(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv);

-	STDMETHODIMP_(BOOL)   GetContactSettingStatic(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv);

-	STDMETHODIMP_(BOOL)   FreeVariant(DBVARIANT *dbv);

-	STDMETHODIMP_(BOOL)   WriteContactSetting(MCONTACT contactID, DBCONTACTWRITESETTING *dbcws);

-	STDMETHODIMP_(BOOL)   DeleteContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting);

-	STDMETHODIMP_(BOOL)   EnumContactSettings(MCONTACT contactID, DBCONTACTENUMSETTINGS* dbces);

-	STDMETHODIMP_(BOOL)   SetSettingResident(BOOL bIsResident, const char *pszSettingName);

-	STDMETHODIMP_(BOOL)   EnumResidentSettings(DBMODULEENUMPROC pFunc, void *pParam);

-	STDMETHODIMP_(BOOL)   IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting);

+	STDMETHODIMP_(LONG)     DeleteContact(MCONTACT contactID);

+	STDMETHODIMP_(HANDLE)   AddContact(void);

+	STDMETHODIMP_(BOOL)     IsDbContact(MCONTACT contactID);

+

+	STDMETHODIMP_(LONG)     GetEventCount(MCONTACT contactID);

+	STDMETHODIMP_(HANDLE)   AddEvent(MCONTACT contactID, DBEVENTINFO *dbe);

+	STDMETHODIMP_(BOOL)     DeleteEvent(MCONTACT contactID, HANDLE hDbEvent);

+	STDMETHODIMP_(LONG)     GetBlobSize(HANDLE hDbEvent);

+	STDMETHODIMP_(BOOL)     GetEvent(HANDLE hDbEvent, DBEVENTINFO *dbe);

+	STDMETHODIMP_(BOOL)     MarkEventRead(MCONTACT contactID, HANDLE hDbEvent);

+	STDMETHODIMP_(MCONTACT) GetEventContact(HANDLE hDbEvent);

+	STDMETHODIMP_(HANDLE)   FindFirstEvent(MCONTACT contactID);

+	STDMETHODIMP_(HANDLE)   FindFirstUnreadEvent(MCONTACT contactID);

+	STDMETHODIMP_(HANDLE)   FindLastEvent(MCONTACT contactID);

+	STDMETHODIMP_(HANDLE)   FindNextEvent(HANDLE hDbEvent);

+	STDMETHODIMP_(HANDLE)   FindPrevEvent(HANDLE hDbEvent);

+								   

+	STDMETHODIMP_(BOOL)     EnumModuleNames(DBMODULEENUMPROC pFunc, void *pParam);

+								   

+	STDMETHODIMP_(BOOL)     GetContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv);

+	STDMETHODIMP_(BOOL)     GetContactSettingStr(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv);

+	STDMETHODIMP_(BOOL)     GetContactSettingStatic(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv);

+	STDMETHODIMP_(BOOL)     FreeVariant(DBVARIANT *dbv);

+	STDMETHODIMP_(BOOL)     WriteContactSetting(MCONTACT contactID, DBCONTACTWRITESETTING *dbcws);

+	STDMETHODIMP_(BOOL)     DeleteContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting);

+	STDMETHODIMP_(BOOL)     EnumContactSettings(MCONTACT contactID, DBCONTACTENUMSETTINGS* dbces);

+	STDMETHODIMP_(BOOL)     SetSettingResident(BOOL bIsResident, const char *pszSettingName);

+	STDMETHODIMP_(BOOL)     EnumResidentSettings(DBMODULEENUMPROC pFunc, void *pParam);

+	STDMETHODIMP_(BOOL)     IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting);

 

 	int CheckProto(DBCachedContact *cc, const char *proto);

 };