From 9ec3c7e78e560356066b272ad7a38d3d333de1b5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 27 May 2018 14:57:51 +0300 Subject: global variable name standardization --- plugins/TabSRMM/src/chat_tools.cpp | 4 ++-- plugins/TabSRMM/src/chat_window.cpp | 8 ++++---- plugins/TabSRMM/src/globals.cpp | 4 ++-- plugins/TabSRMM/src/hotkeyhandler.cpp | 8 ++++---- plugins/TabSRMM/src/mim.cpp | 8 ++++---- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgdlgutils.cpp | 2 +- plugins/TabSRMM/src/msglog.cpp | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp index 1e5a27c8c7..74a0e7468c 100644 --- a/plugins/TabSRMM/src/chat_tools.cpp +++ b/plugins/TabSRMM/src/chat_tools.cpp @@ -38,8 +38,8 @@ static void __stdcall Chat_DismissPopup(void *pi) { SESSION_INFO *si = (SESSION_INFO*)pi; if (si->hContact) - if (g_CLI.pfnGetEvent(si->hContact, 0)) - g_CLI.pfnRemoveEvent(si->hContact, GC_FAKE_EVENT); + if (g_clistApi.pfnGetEvent(si->hContact, 0)) + g_clistApi.pfnRemoveEvent(si->hContact, GC_FAKE_EVENT); if (si->pDlg && KillTimer(si->pDlg->GetHwnd(), TIMERID_FLASHWND)) FlashWindow(si->pDlg->GetHwnd(), FALSE); diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index e51abd0bca..e7e8faaa9f 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -183,8 +183,8 @@ void CChatRoomDlg::UpdateWindowState(UINT msg) if (m_iTabID >= 0) { if (db_get_w(m_si->hContact, m_si->pszModule, "ApparentMode", 0) != 0) db_set_w(m_si->hContact, m_si->pszModule, "ApparentMode", 0); - if (g_CLI.pfnGetEvent(m_si->hContact, 0)) - g_CLI.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT); + if (g_clistApi.pfnGetEvent(m_si->hContact, 0)) + g_clistApi.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT); UpdateTitle(); m_hTabIcon = m_hTabStatusIcon; @@ -581,8 +581,8 @@ void CChatRoomDlg::OnDestroy() if (m_nTypeMode == PROTOTYPE_SELFTYPING_ON) DM_NotifyTyping(PROTOTYPE_SELFTYPING_OFF); - if (g_CLI.pfnGetEvent(m_si->hContact, 0)) - g_CLI.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT); + if (g_clistApi.pfnGetEvent(m_si->hContact, 0)) + g_clistApi.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT); m_si->wState &= ~STATE_TALK; m_si->pDlg = nullptr; m_si = nullptr; diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 0799699983..bdc5bdc3ec 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -111,7 +111,7 @@ void CGlobals::reloadSystemModulesChanged() } else db_set_b(0, SRMSGMOD_T, "ieview_installed", 0); - m_hwndClist = g_CLI.hwndContactList; + m_hwndClist = g_clistApi.hwndContactList; g_bPopupAvail = ServiceExists(MS_POPUP_ADDPOPUPT) != 0; @@ -528,7 +528,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void) mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(e->hContact)); cle.hContact = e->hContact; cle.hDbEvent = e->hEvent; - g_CLI.pfnAddEvent(&cle); + g_clistApi.pfnAddEvent(&cle); } } diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index e541f394eb..21421b3f19 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -143,7 +143,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_HOTKEY: { - CLISTEVENT *cli = g_CLI.pfnGetEvent(-1, 0); + CLISTEVENT *cli = g_clistApi.pfnGetEvent(-1, 0); if (cli != nullptr) { if (strncmp(cli->pszService, MS_MSG_TYPINGMESSAGE, mir_strlen(cli->pszService))) { CallService(cli->pszService, 0, (LPARAM)cli); @@ -337,11 +337,11 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (lParam == 0) HandleMenuEntryFromhContact(wParam); else { - CLISTEVENT *cle = g_CLI.pfnGetEvent(wParam, 0); + CLISTEVENT *cle = g_clistApi.pfnGetEvent(wParam, 0); if (cle) { if (ServiceExists(cle->pszService)) { CallService(cle->pszService, 0, (LPARAM)cle); - g_CLI.pfnRemoveEvent(cle->hContact, cle->hDbEvent); + g_clistApi.pfnRemoveEvent(cle->hContact, cle->hDbEvent); } } // still, we got that message posted.. the event may be waiting in tabSRMMs tray... @@ -380,7 +380,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP case DM_REMOVECLISTEVENT: // sent from the popup to "dismiss" the event. we should do this in the main thread - g_CLI.pfnRemoveEvent(wParam, lParam); + g_clistApi.pfnRemoveEvent(wParam, lParam); db_event_markRead(wParam, lParam); return 0; diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index d64e729331..6dd35d2073 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -276,7 +276,7 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode) Clist_TrayNotifyW(nullptr, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4); if (fShowOnClist) { - g_CLI.pfnRemoveEvent(hContact, 1); + g_clistApi.pfnRemoveEvent(hContact, 1); CLISTEVENT cle = {}; cle.hContact = hContact; @@ -285,7 +285,7 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode) cle.hIcon = PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]; cle.pszService = MS_MSG_TYPINGMESSAGE; cle.szTooltip.w = szTip; - g_CLI.pfnAddEvent(&cle); + g_clistApi.pfnAddEvent(&cle); } } return 0; @@ -390,7 +390,7 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM hDbEvent) if (dbei.markedRead() || (isCustomEvent && !isShownCustomEvent)) return 0; - g_CLI.pfnRemoveEvent(hContact, 1); + g_clistApi.pfnRemoveEvent(hContact, 1); bool bAllowAutoCreate = false; bool bAutoPopup = M.GetBool(SRMSGSET_AUTOPOPUP, SRMSGDEFSET_AUTOPOPUP); @@ -518,7 +518,7 @@ nowindowcreate: contactName = Clist_GetContactDisplayName(hContact); mir_snwprintf(toolTip, TranslateT("Message from %s"), contactName); cle.szTooltip.w = toolTip; - g_CLI.pfnAddEvent(&cle); + g_clistApi.pfnAddEvent(&cle); } tabSRMM_ShowPopup(hContact, hDbEvent, dbei.eventType, 0, nullptr, nullptr, dbei.szModule); } diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 174aa7bcf9..604f43ac0b 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -277,7 +277,7 @@ void CSrmmWindow::MsgWindowUpdateState(UINT msg) if (m_dwFlagsEx & MWF_SHOW_FLASHCLIST) { m_dwFlagsEx &= ~MWF_SHOW_FLASHCLIST; if (m_hFlashingEvent != 0) - g_CLI.pfnRemoveEvent(m_hContact, m_hFlashingEvent); + g_clistApi.pfnRemoveEvent(m_hContact, m_hFlashingEvent); m_hFlashingEvent = 0; } m_pContainer->dwFlags &= ~CNT_NEED_UPDATETITLE; diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 721046180f..e5c2cd2186 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -778,7 +778,7 @@ void CTabBaseDlg::FlashOnClist(MEVENT hEvent, DBEVENTINFO *dbei) cle.hDbEvent = hEvent; cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE); cle.pszService = MS_MSG_READMESSAGE; - g_CLI.pfnAddEvent(&cle); + g_clistApi.pfnAddEvent(&cle); m_dwFlagsEx |= MWF_SHOW_FLASHCLIST; m_hFlashingEvent = hEvent; diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp index d275d001c1..7c9c1fa2ec 100644 --- a/plugins/TabSRMM/src/msglog.cpp +++ b/plugins/TabSRMM/src/msglog.cpp @@ -482,7 +482,7 @@ static char* Template_CreateRTFFromDbEvent(CTabBaseDlg *dat, MCONTACT hContact, if (!isSent && (bIsStatusChangeEvent || dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) { db_event_markRead(hContact, hDbEvent); - g_CLI.pfnRemoveEvent(hContact, hDbEvent); + g_clistApi.pfnRemoveEvent(hContact, hDbEvent); } g_groupBreak = TRUE; -- cgit v1.2.3