From 01e48461e3ddf45c2e9065276ff4b4c5f59ae77b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 25 Mar 2018 21:39:35 +0300 Subject: MIDatabaseChecker interface removed --- plugins/Dbx_mdbx/src/dbintf.cpp | 30 ------------------------------ plugins/Dbx_mdbx/src/dbintf.h | 9 +-------- plugins/Dbx_mdbx/src/version.h | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) (limited to 'plugins/Dbx_mdbx') diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp index aa2cd398b3..5ecac705be 100644 --- a/plugins/Dbx_mdbx/src/dbintf.cpp +++ b/plugins/Dbx_mdbx/src/dbintf.cpp @@ -196,33 +196,3 @@ int CDbxMDBX::Map() mode |= MDBX_RDONLY; return mdbx_env_open(m_env, _T2A(m_tszProfileName), mode, 0664); } - -/////////////////////////////////////////////////////////////////////////////// -// MIDatabaseChecker - -typedef int (CDbxMDBX::*CheckWorker)(void); - -int CDbxMDBX::Start(DBCHeckCallback *callback) -{ - cb = callback; - return ERROR_SUCCESS; -} - -static CheckWorker Workers[6] = -{ - &CDbxMDBX::CheckEvents1, - &CDbxMDBX::CheckEvents2, -}; - -int CDbxMDBX::CheckDb(int phase, int) -{ - if (phase >= _countof(Workers)) - return ERROR_OUT_OF_PAPER; - - return (this->*Workers[phase])(); -} - -void CDbxMDBX::Destroy() -{ - delete this; -} diff --git a/plugins/Dbx_mdbx/src/dbintf.h b/plugins/Dbx_mdbx/src/dbintf.h index 725bc28c61..66515934b3 100644 --- a/plugins/Dbx_mdbx/src/dbintf.h +++ b/plugins/Dbx_mdbx/src/dbintf.h @@ -129,7 +129,7 @@ struct EventItem MEVENT eventId; }; -struct CDbxMDBX : public MDatabaseCommon, public MIDatabaseChecker, public MZeroedObject +struct CDbxMDBX : public MDatabaseCommon, public MZeroedObject { friend class MDBXEventCursor; @@ -194,11 +194,6 @@ public: STDMETHODIMP_(BOOL) MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub); STDMETHODIMP_(BOOL) MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub); -protected: - STDMETHODIMP_(BOOL) Start(DBCHeckCallback *callback); - STDMETHODIMP_(BOOL) CheckDb(int phase, int firstTime); - STDMETHODIMP_(VOID) Destroy(); - protected: void FillContacts(void); @@ -272,8 +267,6 @@ protected: uint32_t GetModuleID(const char *szName); char* GetModuleName(uint32_t dwId); - DBCHeckCallback *cb; - //////////////////////////////////////////////////////////////////////////// // encryption diff --git a/plugins/Dbx_mdbx/src/version.h b/plugins/Dbx_mdbx/src/version.h index 543e9abbe4..094b434a85 100644 --- a/plugins/Dbx_mdbx/src/version.h +++ b/plugins/Dbx_mdbx/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 95 #define __RELEASE_NUM 8 -#define __BUILD_NUM 5 +#define __BUILD_NUM 6 #include -- cgit v1.2.3