From 436e303e24e5046d6cc52ac3da51a0b51adbef36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 15 Jun 2020 18:35:21 +0300
Subject: simpler way of applying server ids to messages

---
 plugins/Import/src/dbrw/dbintf.cpp | 5 -----
 plugins/Import/src/dbrw/dbintf.h   | 1 -
 plugins/Import/src/textjson.cpp    | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'plugins/Import/src')

diff --git a/plugins/Import/src/dbrw/dbintf.cpp b/plugins/Import/src/dbrw/dbintf.cpp
index aae77e66ab..4369c03eea 100644
--- a/plugins/Import/src/dbrw/dbintf.cpp
+++ b/plugins/Import/src/dbrw/dbintf.cpp
@@ -85,8 +85,3 @@ STDMETHODIMP_(MEVENT) CDbxSQLite::GetEventById(LPCSTR, LPCSTR)
 {
 	return 0;
 }
-
-STDMETHODIMP_(BOOL) CDbxSQLite::SetEventId(LPCSTR, MEVENT, LPCSTR)
-{
-	return FALSE;
-}
diff --git a/plugins/Import/src/dbrw/dbintf.h b/plugins/Import/src/dbrw/dbintf.h
index 09d7514f2f..e6a171f87d 100644
--- a/plugins/Import/src/dbrw/dbintf.h
+++ b/plugins/Import/src/dbrw/dbintf.h
@@ -156,5 +156,4 @@ public:
 	STDMETHODIMP_(BOOL)     MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) override;
 
 	STDMETHODIMP_(MEVENT)   GetEventById(LPCSTR szModule, LPCSTR szId) override;
-	STDMETHODIMP_(BOOL)     SetEventId(LPCSTR szModule, MEVENT, LPCSTR szId) override;
 };
diff --git a/plugins/Import/src/textjson.cpp b/plugins/Import/src/textjson.cpp
index 242574cc3a..b2fc92dae1 100644
--- a/plugins/Import/src/textjson.cpp
+++ b/plugins/Import/src/textjson.cpp
@@ -151,7 +151,7 @@ public:
 			dbei->szModule = m_modules.find((char*)szModule.c_str());
 			if (dbei->szModule == nullptr) {
 				dbei->szModule = mir_strdup(szModule.c_str());
-				m_modules.insert(dbei->szModule);
+				m_modules.insert((char*)dbei->szModule);
 			}
 		}
 
-- 
cgit v1.2.3