From 3dd1a999c9e643fd92fd34301d9e65a7f07d8c54 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Mar 2017 14:28:10 +0300 Subject: various code cleaning & name conflict resolution --- plugins/Scriver/src/msgdialog.cpp | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'plugins/Scriver/src/msgdialog.cpp') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index a2328f2176..6c31cdc6ec 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -99,7 +99,7 @@ void NotifyLocalWinEvent(MCONTACT hContact, HWND hwnd, unsigned int type) MessageWindowEventData mwe = { sizeof(mwe) }; mwe.hContact = hContact; mwe.hwndWindow = hwnd; - mwe.szModule = SRMMMOD; + mwe.szModule = SRMM_MODULE; mwe.uType = type; mwe.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH; mwe.hwndInput = GetDlgItem(hwnd, IDC_MESSAGE); @@ -544,7 +544,7 @@ bool CSrmmWindow::IsTypingNotificationSupported() bool CSrmmWindow::IsTypingNotificationEnabled() { - if (!db_get_b(m_hContact, SRMMMOD, SRMSGSET_TYPING, db_get_b(0, SRMMMOD, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))) + if (!db_get_b(m_hContact, SRMM_MODULE, SRMSGSET_TYPING, db_get_b(0, SRMM_MODULE, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))) return FALSE; DWORD protoStatus = CallProtoService(m_szProto, PS_GETSTATUS, 0, 0); @@ -559,7 +559,7 @@ bool CSrmmWindow::IsTypingNotificationEnabled() return FALSE; if (db_get_b(m_hContact, "CList", "NotOnList", 0) - && !db_get_b(0, SRMMMOD, SRMSGSET_TYPINGUNKNOWN, SRMSGDEFSET_TYPINGUNKNOWN)) + && !db_get_b(0, SRMM_MODULE, SRMSGSET_TYPINGUNKNOWN, SRMSGDEFSET_TYPINGUNKNOWN)) return FALSE; return TRUE; } @@ -673,7 +673,7 @@ void CSrmmWindow::OnInitDialog() m_lastEventTime = time(nullptr); m_startTime = time(nullptr); - m_bUseRtl = db_get_b(m_hContact, SRMMMOD, "UseRTL", 0) != 0; + m_bUseRtl = db_get_b(m_hContact, SRMM_MODULE, "UseRTL", 0) != 0; m_bUseIEView = g_dat.ieviewInstalled ? (g_dat.flags & SMF_USEIEVIEW) != 0 : false; PARAFORMAT2 pf2; @@ -769,7 +769,7 @@ void CSrmmWindow::OnInitDialog() bool notifyUnread = false; if (m_hContact) { - int historyMode = db_get_b(0, SRMMMOD, SRMSGSET_LOADHISTORY, SRMSGDEFSET_LOADHISTORY); + int historyMode = db_get_b(0, SRMM_MODULE, SRMSGSET_LOADHISTORY, SRMSGDEFSET_LOADHISTORY); // This finds the first message to display, it works like shit m_hDbEventFirst = db_event_firstUnread(m_hContact); if (m_hDbEventFirst != 0) { @@ -783,7 +783,7 @@ void CSrmmWindow::OnInitDialog() MEVENT hPrevEvent; switch (historyMode) { case LOADHISTORY_COUNT: - for (int i = db_get_w(0, SRMMMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT); i > 0; i--) { + for (int i = db_get_w(0, SRMM_MODULE, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT); i > 0; i--) { if (m_hDbEventFirst == 0) hPrevEvent = db_event_last(m_hContact); else @@ -807,7 +807,7 @@ void CSrmmWindow::OnInitDialog() db_event_get(m_hDbEventFirst, &dbei); hPrevEvent = db_event_prev(m_hContact, m_hDbEventFirst); } - DWORD firstTime = dbei.timestamp - 60 * db_get_w(0, SRMMMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME); + DWORD firstTime = dbei.timestamp - 60 * db_get_w(0, SRMM_MODULE, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME); for (;;) { if (hPrevEvent == 0) break; @@ -883,7 +883,7 @@ void CSrmmWindow::OnDestroy() if (hFont != nullptr && hFont != (HFONT)m_btnOk.SendMsg(WM_GETFONT, 0, 0)) DeleteObject(hFont); - db_set_b(m_hContact, SRMMMOD, "UseRTL", m_bUseRtl); + db_set_b(m_hContact, SRMM_MODULE, "UseRTL", m_bUseRtl); if (m_hContact && (g_dat.flags & SMF_DELTEMP)) if (db_get_b(m_hContact, "CList", "NotOnList", 0)) db_delete_contact(m_hContact); @@ -946,7 +946,7 @@ void CSrmmWindow::onClick_Ok(CCtrlButton *pButton) SetDlgItemText(m_hwnd, IDC_MESSAGE, L""); EnableWindow(GetDlgItem(m_hwnd, IDOK), FALSE); - if (db_get_b(0, SRMMMOD, SRMSGSET_AUTOMIN, SRMSGDEFSET_AUTOMIN)) + if (db_get_b(0, SRMM_MODULE, SRMSGSET_AUTOMIN, SRMSGDEFSET_AUTOMIN)) ShowWindow(m_hwndParent, SW_MINIMIZE); if (pButton == nullptr) @@ -1089,13 +1089,13 @@ void CSrmmWindow::UpdateStatusBar() UpdateReadChars(); StatusIconData sid = { sizeof(sid) }; - sid.szModule = SRMMMOD; + sid.szModule = SRMM_MODULE; sid.flags = MBF_DISABLED; Srmm_ModifyIcon(m_hContact, &sid); sid.dwId = 1; if (IsTypingNotificationSupported() && g_dat.flags2 & SMF2_SHOWTYPINGSWITCH) - sid.flags = (db_get_b(m_hContact, SRMMMOD, SRMSGSET_TYPING, - db_get_b(0, SRMMMOD, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))) ? 0 : MBF_DISABLED; + sid.flags = (db_get_b(m_hContact, SRMM_MODULE, SRMSGSET_TYPING, + db_get_b(0, SRMM_MODULE, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))) ? 0 : MBF_DISABLED; else sid.flags = MBF_HIDDEN; @@ -1110,7 +1110,7 @@ static const wchar_t *titleTokenNames[] = { L"%name%", L"%status%", L"%statusmsg void CSrmmWindow::UpdateTitle() { CMStringW wszTitle; - ptrW tmplt(db_get_wsa(0, SRMMMOD, SRMSGSET_WINDOWTITLE)); + ptrW tmplt(db_get_wsa(0, SRMM_MODULE, SRMSGSET_WINDOWTITLE)); if (tmplt != nullptr) wszTitle = tmplt; else if (g_dat.flags & SMF_STATUSICON) @@ -1281,9 +1281,9 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) SendMessage(m_hwnd, DM_GETAVATAR, 0, 0); SetDialogToType(); { - COLORREF colour = db_get_dw(0, SRMMMOD, SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR); + COLORREF colour = db_get_dw(0, SRMM_MODULE, SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR); m_log.SendMsg(EM_SETBKGNDCOLOR, 0, colour); - colour = db_get_dw(0, SRMMMOD, SRMSGSET_INPUTBKGCOLOUR, SRMSGDEFSET_INPUTBKGCOLOUR); + colour = db_get_dw(0, SRMM_MODULE, SRMSGSET_INPUTBKGCOLOUR, SRMSGDEFSET_INPUTBKGCOLOUR); m_message.SendMsg(EM_SETBKGNDCOLOR, 0, colour); InvalidateRect(m_message.GetHwnd(), nullptr, FALSE); @@ -1346,12 +1346,12 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) case DM_SWITCHTYPING: if (IsTypingNotificationSupported()) { StatusIconData sid = { sizeof(sid) }; - sid.szModule = SRMMMOD; + sid.szModule = SRMM_MODULE; sid.dwId = 1; - BYTE typingNotify = (db_get_b(m_hContact, SRMMMOD, SRMSGSET_TYPING, - db_get_b(0, SRMMMOD, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))); - db_set_b(m_hContact, SRMMMOD, SRMSGSET_TYPING, (BYTE)!typingNotify); + BYTE typingNotify = (db_get_b(m_hContact, SRMM_MODULE, SRMSGSET_TYPING, + db_get_b(0, SRMM_MODULE, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))); + db_set_b(m_hContact, SRMM_MODULE, SRMSGSET_TYPING, (BYTE)!typingNotify); sid.flags = typingNotify ? MBF_DISABLED : 0; Srmm_ModifyIcon(m_hContact, &sid); } @@ -1581,7 +1581,6 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) } } else if (wParam == TIMERID_UNREAD) { - TabControlData tcd; tcd.iFlags = TCDF_ICON; if (!m_bShowTyping) { m_iShowUnread++; -- cgit v1.2.3