unique class name

git-svn-id: http://svn.miranda-ng.org/main/trunk@12591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 5 insertions, 15 deletions

diff --git a/plugins/Dbx_kyoto/src/dbintf.h b/plugins/Dbx_kyoto/src/dbintf.h
index cbf2510f19..3d05288d26 100644
--- a/plugins/Dbx_kyoto/src/dbintf.h
+++ b/plugins/Dbx_kyoto/src/dbintf.h
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include <kchashdb.h>
+#include <kchashdb.h>

 using namespace kyotocabinet;

 

 /* tree diagram

@@ -61,13 +61,6 @@ struct ModuleName
 

 #include <pshpack1.h>

 

-#define DBHEADER_SIGNATURE  0x40DECADEu

-struct DBHeader

-{

-	DWORD dwSignature;

-	DWORD dwVersion;			// database format version

-};

-

 #define DBCONTACT_SIGNATURE 0x43DECADEu

 struct DBContact

 {

@@ -133,10 +126,10 @@ struct CTable : public TreeDB
 	}

 };

 

-struct CDbxKV : public MIDatabase, public MIDatabaseChecker, public MZeroedObject

+struct CDbxKyoto : public MIDatabase, public MIDatabaseChecker, public MZeroedObject

 {

-	CDbxKV(const TCHAR *tszFileName, int mode);

-	~CDbxKV();

+	CDbxKyoto(const TCHAR *tszFileName, int mode);

+	~CDbxKyoto();

 

 	int Load(bool bSkipInit);

 	int Create(void);

@@ -227,11 +220,8 @@ public:
 	MICryptoEngine *m_crypto;

 

 protected:

-	CTable   m_dbGlobal;

-	DBHeader m_header;

-

 	HANDLE   hSettingChangeEvent, hContactDeletedEvent, hContactAddedEvent, hEventMarkedRead;

-

+	DWORD    m_dwVersion;

 	mir_cs   m_csDbAccess;

 

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