CLogWindow::LogEvents considered useless and localized inside tabSRMM

10 files changed, 18 insertions, 51 deletions

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index 3bf29fc7d1..d81426d63b 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -128,7 +128,6 @@ public:
 	virtual HWND     GetHwnd() = 0;
 	virtual wchar_t* GetSelection() = 0;
 	virtual void     LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) = 0;
-	virtual void     LogEvents(DBEVENTINFO *dbei, bool bAppend) = 0;
 	virtual void     LogEvents(struct LOGINFO *, bool) = 0;
 	virtual void     Resize() = 0;
 	virtual void     ScrollToBottom() = 0;
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 1a088be1b7..8e2e2c40ac 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -828,10 +828,6 @@ void CLogWindow::LogEvents(MEVENT hDbEventFirst, int count, bool bAppend)
 	m_pDlg.m_hDbEventLast = streamData.hDbEventLast;

 }

 

-void CLogWindow::LogEvents(DBEVENTINFO*, bool)

-{

-}

-

 void CLogWindow::LogEvents(LOGINFO *lin, bool bRedraw)

 {

 	auto *si = m_pDlg.m_si;

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index bc1bb201ad..e25128b5ac 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -38,7 +38,6 @@ public:
 

 	void Attach() override;

 	void LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) override;

-	void LogEvents(DBEVENTINFO *dbei, bool bAppend) override;

 	void LogEvents(struct LOGINFO *, bool) override;

 	void ScrollToBottom() override;

 	void UpdateOptions() override;

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 10b4a25444..e48a705a71 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -536,5 +536,5 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 	dbei.eventType = EVENTTYPE_STATUSCHANGE;

 	dbei.timestamp = time(0);

 	dbei.szModule = (char*)c->getProto();

-	dat->LogEvent(&dbei);

+	dat->LogEvent(dbei);

 }

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 249863ec01..8317d4bd0c 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -853,6 +853,19 @@ void CMsgDialog::LoadSplitter()
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
+
+void CMsgDialog::LogEvent(DBEVENTINFO &dbei)
+{
+	dbei.flags |= DBEF_TEMPORARY;
+	
+	MEVENT hDbEvent = db_event_add(m_hContact, &dbei);
+	if (hDbEvent) {
+		m_pLog->LogEvents(hDbEvent, 1, true);
+		db_event_delete(hDbEvent);
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
 // draw various elements of the message window, like avatar(s), info panel fields
 // and the color formatting menu
 
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index cd057cae83..b053d0b47e 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -1207,11 +1207,6 @@ void CLogWindow::LogEvents(MEVENT hDbEventFirst, int count, bool fAppend)
 	LogEvents(hDbEventFirst, count, fAppend, nullptr);

 }

 

-void CLogWindow::LogEvents(DBEVENTINFO *dbei, bool bAppend)

-{

-	LogEvents(0, 1, bAppend, dbei);

-}

-

 void CLogWindow::LogEvents(MEVENT hDbEventFirst, int count, bool fAppend, DBEVENTINFO *dbei_s)

 {

 	CHARRANGE oldSel, sel;

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 339e4cbd36..60d429910d 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -311,7 +311,6 @@ public:
 

 	void Attach() override;

 	void LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) override;

-	void LogEvents(DBEVENTINFO *dbei, bool bAppend) override;

 	void LogEvents(struct LOGINFO *, bool) override;

 	void ScrollToBottom() override;

 	void UpdateOptions() override;

@@ -577,9 +576,7 @@ public:
 		return ((CLogWindow *)m_pLog);

 	}

 

-	__forceinline void LogEvent(DBEVENTINFO *dbei) {

-		m_pLog->LogEvents(dbei, 1);

-	}

+	void LogEvent(DBEVENTINFO &dbei);

 

 	bool IsActive() const override

 	{

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 8f33be1bea..a31bbac0fd 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -358,7 +358,7 @@ void SendQueue::logError(CMsgDialog *dat, int iSendJobIndex, const wchar_t *szEr
 	dbei.cbBlob = (int)iMsgLen;
 	dbei.timestamp = time(0);
 	dbei.szModule = (char *)szErrMsg;
-	dat->LogEvent(&dbei);
+	dat->LogEvent(dbei);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -554,7 +554,7 @@ int SendQueue::doSendLater(int iJobIndex, CMsgDialog *dat, MCONTACT hContact, bo
 		dbei.timestamp = time(0);
 		dbei.cbBlob = (int)mir_strlen(utfText) + 1;
 		dbei.pBlob = (PBYTE)(char*)utfText;
-		dat->LogEvent(&dbei);
+		dat->LogEvent(dbei);
 
 		if (dat->m_hDbEventFirst == 0)
 			dat->RemakeLog();
diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index 7829258d75..4b5cc80143 100644
--- a/plugins/TabSRMM/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
@@ -262,7 +262,7 @@ void CTemplateEditDlg::onClick_Preview(CCtrlButton*)
 	m_dwFlags = (iIndex == 0 || iIndex == 1) ? m_dwFlags & ~MWF_LOG_GROUPMODE : m_dwFlags | MWF_LOG_GROUPMODE;
 	mir_snwprintf(m_wszMyNickname, L"My Nickname");
 	m_pLog->Clear();
-	LogEvent(&dbei);
+	LogEvent(dbei);
 	if (changed)
 		memcpy(tSet->szTemplates[inEdit], szTemp, TEMPLATE_LENGTH * sizeof(wchar_t));
 }
diff --git a/src/mir_app/src/srmm_log_hpp.cpp b/src/mir_app/src/srmm_log_hpp.cpp
index dff4dff626..2a6be38bab 100644
--- a/src/mir_app/src/srmm_log_hpp.cpp
+++ b/src/mir_app/src/srmm_log_hpp.cpp
@@ -109,38 +109,6 @@ public:
 		CallService(MS_HPP_EG_EVENT, 0, (LPARAM)&event);
 	}
 
-	void LogEvents(DBEVENTINFO *dbei, bool bAppend) override
-	{
-		if (!bAppend)
-			Clear();
-
-		IEVIEWEVENT event = {};
-		event.hwnd = m_hwnd;
-		event.iType = IEE_LOG_MEM_EVENTS;
-
-		IEVIEWEVENTDATA evData = {};
-		if (dbei->flags & DBEF_SENT) {
-			evData.dwFlags = IEEDF_SENT;
-			evData.bIsMe = true;
-		}
-		else {
-			evData.dwFlags = IEEDF_UNICODE_NICK;
-			evData.szNick.w = Clist_GetContactDisplayName(m_pDlg.m_hContact);
-		}
-		switch (dbei->eventType) {
-		case EVENTTYPE_STATUSCHANGE: evData.iType = IEED_EVENT_STATUSCHANGE; break;
-		case EVENTTYPE_FILE: evData.iType = IEED_EVENT_FILE; break;
-		case EVENTTYPE_ERRMSG: evData.iType = IEED_EVENT_ERRMSG; break;
-		default: evData.iType = IEED_EVENT_MESSAGE; break;
-		}
-		evData.szText.a = (char *)dbei->pBlob;
-		evData.time = dbei->timestamp;
-		event.eventData = &evData;
-		event.codepage = CP_UTF8;
-		event.count = 1;
-		CallService(MS_HPP_EG_EVENT, 0, (LPARAM)&event);
-	}
-
 	void CHppLogWindow::LogEvents(LOGINFO *pLog, bool)
 	{
 		IEVIEWEVENTDATA ied = {};