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

diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp
index 6afab80691..472ebcdd82 100644
--- a/plugins/Db3x_mmap/src/dbevents.cpp
+++ b/plugins/Db3x_mmap/src/dbevents.cpp
@@ -305,17 +305,17 @@ STDMETHODIMP_(BOOL) CDb3Mmap::MarkEventRead(MCONTACT contactID, HANDLE hDbEvent)
 	return ret;

 }

 

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

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

 {

 	mir_cslock lck(m_csDbAccess);

 	DBEvent *dbe = (DBEvent*)DBRead((DWORD)hDbEvent, sizeof(DBEvent), NULL);

 	if (dbe->signature != DBEVENT_SIGNATURE)

-		return (HANDLE)-1;

+		return INVALID_CONTACT_ID;

 

 	while (!(dbe->flags & DBEF_FIRST))

 		dbe = (DBEvent*)DBRead(dbe->ofsPrev, sizeof(DBEvent), NULL);

 

-	return (HANDLE)dbe->ofsPrev;

+	return dbe->ofsPrev;

 }

 

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

diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 629b2972f8..633c7aa7f5 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -184,43 +184,43 @@ struct CDb3Mmap : public MIDatabase, public MIDatabaseChecker, public MZeroedObj
 public:

 	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);

 

 protected:

-	STDMETHODIMP_(BOOL)   Start(DBCHeckCallback *callback);

-	STDMETHODIMP_(BOOL)   CheckDb(int phase, int firstTime);

-	STDMETHODIMP_(VOID)   Destroy();

+	STDMETHODIMP_(BOOL)     Start(DBCHeckCallback *callback);

+	STDMETHODIMP_(BOOL)     CheckDb(int phase, int firstTime);

+	STDMETHODIMP_(VOID)     Destroy();

 

 protected:

 	DWORD GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc, DWORD ofsContact, DWORD ofsModuleName);