diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-03-24 15:22:00 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-03-24 15:22:00 +0300 |
| commit | 9774715b1914ac65ada1211322bfd080af694af9 (patch) | |
| tree | 639b14e2201ffa0ebe5c514114ca30f23d1f8c70 /src | |
| parent | b873a2605a28bbf43e9cc6679562cf6bbabad601 (diff) | |
code cleaning
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/msglog.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/stdafx.h | 3 | ||||
| -rw-r--r-- | src/mir_app/src/chat_log.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_log_rtf.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 83c1f79ac9..62cf73ca53 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -144,7 +144,7 @@ static void SetToStyle(int style, CMStringA &dest) bool DbEventIsShown(const DB::EventInfo &dbei)
{
- return dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_FILE || dbei.isSrmm();
+ return dbei.isSrmm();
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index 7d8cb2f962..27a9c076e3 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -201,8 +201,7 @@ void Load_ChatModule(void); void InitGlobals(void);
// log.cpp
-char* Log_CreateRtfHeader(void);
-CSrmmLogWindow *logBuilder(CMsgDialog &pDlg);
+CSrmmLogWindow* logBuilder(CMsgDialog &pDlg);
// window.cpp
SESSION_INFO* SM_GetPrevWindow(SESSION_INFO *si);
diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp index b5479987b1..32bd10bcc3 100644 --- a/src/mir_app/src/chat_log.cpp +++ b/src/mir_app/src/chat_log.cpp @@ -319,7 +319,7 @@ void CRtfLogWindow::CreateChatRtfMessage(RtfChatLogStreamData *streamData, const if (lin.hEvent) {
DB::EventInfo dbei(lin.hEvent);
if (dbei) {
- if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_FILE || dbei.isSrmm())
+ if (dbei.isSrmm())
m_pDlg.MarkEventRead(dbei);
if (dbei.eventType == EVENTTYPE_FILE) {
diff --git a/src/mir_app/src/srmm_log_rtf.cpp b/src/mir_app/src/srmm_log_rtf.cpp index 164f8cb559..0531b3e445 100644 --- a/src/mir_app/src/srmm_log_rtf.cpp +++ b/src/mir_app/src/srmm_log_rtf.cpp @@ -335,7 +335,7 @@ static bool CreateRtfFromDbEvent(RtfLogStreamData *dat) return false;
if (!(dbei.flags & DBEF_SENT)) {
- if (dbei.eventType == EVENTTYPE_MESSAGE || dbei.isSrmm())
+ if (dbei.isSrmm())
dat->pLog->GetDialog().MarkEventRead(dbei);
else if (dbei.eventType == EVENTTYPE_FILE) {
|