diff options
author | George Hazan <ghazan@miranda.im> | 2021-11-07 19:24:53 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2021-11-07 19:24:53 +0300 |
commit | 2d3b4b958926b3ed7d4a5d997121fe91a12f83cc (patch) | |
tree | 1c40efd80b1fefc6dc2c80ad258f136754a02b7d /plugins/Import/src/dbrw | |
parent | 3d88a792fb2f3950989d95d91e7de57fa1b74923 (diff) |
update for system includes & import libraries
Diffstat (limited to 'plugins/Import/src/dbrw')
-rw-r--r-- | plugins/Import/src/dbrw/dbcontacts.cpp | 6 | ||||
-rw-r--r-- | plugins/Import/src/dbrw/dbevents.cpp | 4 | ||||
-rw-r--r-- | plugins/Import/src/dbrw/dbintf.h | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Import/src/dbrw/dbcontacts.cpp b/plugins/Import/src/dbrw/dbcontacts.cpp index 110e5ad322..a100788717 100644 --- a/plugins/Import/src/dbrw/dbcontacts.cpp +++ b/plugins/Import/src/dbrw/dbcontacts.cpp @@ -43,7 +43,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::IsDbContact(MCONTACT contactID) return (cc != nullptr); } -STDMETHODIMP_(LONG) CDbxSQLite::GetContactCount(void) +STDMETHODIMP_(int) CDbxSQLite::GetContactCount(void) { int res = 0; if (sql_step(ctc_stmts_prep[SQL_CTC_STMT_COUNT]) == SQLITE_ROW) @@ -52,7 +52,7 @@ STDMETHODIMP_(LONG) CDbxSQLite::GetContactCount(void) return res; } -STDMETHODIMP_(LONG) CDbxSQLite::GetContactSize(void) +STDMETHODIMP_(int) CDbxSQLite::GetContactSize(void) { return sizeof(DBCachedContact); } @@ -62,7 +62,7 @@ STDMETHODIMP_(MCONTACT) CDbxSQLite::AddContact(void) return INVALID_CONTACT_ID; } -STDMETHODIMP_(LONG) CDbxSQLite::DeleteContact(MCONTACT) +STDMETHODIMP_(int) CDbxSQLite::DeleteContact(MCONTACT) { return 1; } diff --git a/plugins/Import/src/dbrw/dbevents.cpp b/plugins/Import/src/dbrw/dbevents.cpp index 4fcfa650fe..92e100737d 100644 --- a/plugins/Import/src/dbrw/dbevents.cpp +++ b/plugins/Import/src/dbrw/dbevents.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../stdafx.h" -STDMETHODIMP_(LONG) CDbxSQLite::GetEventCount(MCONTACT contactID) +STDMETHODIMP_(int) CDbxSQLite::GetEventCount(MCONTACT contactID) { mir_cslock lock(m_csDbAccess); @@ -49,7 +49,7 @@ BOOL CDbxSQLite::EditEvent(MCONTACT, MEVENT, const DBEVENTINFO*) return 1; } -STDMETHODIMP_(LONG) CDbxSQLite::GetBlobSize(MEVENT hDbEvent) +STDMETHODIMP_(int) CDbxSQLite::GetBlobSize(MEVENT hDbEvent) { mir_cslock lock(m_csDbAccess); diff --git a/plugins/Import/src/dbrw/dbintf.h b/plugins/Import/src/dbrw/dbintf.h index 481ff173de..e77842de21 100644 --- a/plugins/Import/src/dbrw/dbintf.h +++ b/plugins/Import/src/dbrw/dbintf.h @@ -125,17 +125,17 @@ public: STDMETHODIMP_(BOOL) IsRelational(void) override { return FALSE; } STDMETHODIMP_(void) SetCacheSafetyMode(BOOL) override; - STDMETHODIMP_(LONG) GetContactCount(void) override; - STDMETHODIMP_(LONG) DeleteContact(MCONTACT contactID) override; + STDMETHODIMP_(int) GetContactCount(void) override; + STDMETHODIMP_(int) DeleteContact(MCONTACT contactID) override; STDMETHODIMP_(MCONTACT) AddContact(void) override; STDMETHODIMP_(BOOL) IsDbContact(MCONTACT contactID) override; - STDMETHODIMP_(LONG) GetContactSize(void) override; + STDMETHODIMP_(int) GetContactSize(void) override; - STDMETHODIMP_(LONG) GetEventCount(MCONTACT contactID) override; + STDMETHODIMP_(int) GetEventCount(MCONTACT contactID) override; STDMETHODIMP_(MEVENT) AddEvent(MCONTACT contactID, const DBEVENTINFO *dbe) override; STDMETHODIMP_(BOOL) DeleteEvent(MEVENT hDbEvent) override; STDMETHODIMP_(BOOL) EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO *dbe) override; - STDMETHODIMP_(LONG) GetBlobSize(MEVENT hDbEvent) override; + STDMETHODIMP_(int) GetBlobSize(MEVENT hDbEvent) override; STDMETHODIMP_(BOOL) GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbe) override; STDMETHODIMP_(BOOL) MarkEventRead(MCONTACT contactID, MEVENT hDbEvent) override; STDMETHODIMP_(MCONTACT) GetEventContact(MEVENT hDbEvent) override; |