From 9ec3c7e78e560356066b272ad7a38d3d333de1b5 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 27 May 2018 14:57:51 +0300
Subject: global variable name standardization

---
 src/core/stdmsg/src/chat_manager.cpp |  4 ++--
 src/core/stdmsg/src/chat_window.cpp  |  4 ++--
 src/core/stdmsg/src/msgdialog.cpp    |  2 +-
 src/core/stdmsg/src/msglog.cpp       |  2 +-
 src/core/stdmsg/src/msgs.cpp         | 10 +++++-----
 src/core/stdmsg/src/tabs.cpp         |  4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 38d36978ad..30dfa94bb8 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -73,10 +73,10 @@ static void OnCreateModule(MODULEINFO *mi)
 {
 	OnDestroyModule(mi);
 
-	mi->OnlineIconIndex = g_CLI.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_ONLINE, 0);
+	mi->OnlineIconIndex = g_clistApi.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_ONLINE, 0);
 	mi->hOnlineIcon = ImageList_GetIcon(Clist_GetImageList(), mi->OnlineIconIndex, ILD_TRANSPARENT);
 
-	mi->OfflineIconIndex = g_CLI.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_OFFLINE, 0);
+	mi->OfflineIconIndex = g_clistApi.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_OFFLINE, 0);
 	mi->hOfflineIcon = ImageList_GetIcon(Clist_GetImageList(), mi->OfflineIconIndex, ILD_TRANSPARENT);
 }
 
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 828961afc8..8b2aa83de4 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -104,8 +104,8 @@ void CChatRoomDlg::OnActivate()
 		FlashWindow(m_pOwner->GetHwnd(), FALSE);
 	if (db_get_w(m_hContact, m_si->pszModule, "ApparentMode", 0) != 0)
 		db_set_w(m_hContact, m_si->pszModule, "ApparentMode", 0);
-	if (g_CLI.pfnGetEvent(m_hContact, 0))
-		g_CLI.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
+	if (g_clistApi.pfnGetEvent(m_hContact, 0))
+		g_clistApi.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
 }
 
 void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index e8e95ecff8..8a9524e3b4 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -455,7 +455,7 @@ void CSrmmWindow::OnSplitterMoved(CSplitter *pSplitter)
 
 int CSrmmWindow::GetImageId() const
 {
-	return (WORD)g_CLI.pfnIconFromStatusMode(m_szProto, m_wStatus, m_hContact);
+	return (WORD)g_clistApi.pfnIconFromStatusMode(m_szProto, m_wStatus, m_hContact);
 }
 
 void CSrmmWindow::NotifyTyping(int mode)
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 029d72a8e2..1a2d22043b 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -215,7 +215,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
 	
 	if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) {
 		db_event_markRead(dat->hContact, dat->hDbEvent);
-		g_CLI.pfnRemoveEvent(dat->hContact, dat->hDbEvent);
+		g_clistApi.pfnRemoveEvent(dat->hContact, dat->hDbEvent);
 	}
 	else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) {
 		db_event_markRead(dat->hContact, dat->hDbEvent);
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 9f4532041b..869d679855 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -90,7 +90,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	if (dbei.flags & (DBEF_SENT | DBEF_READ) || !(dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)))
 		return 0;
 
-	g_CLI.pfnRemoveEvent(hContact, 1);
+	g_clistApi.pfnRemoveEvent(hContact, 1);
 	/* does a window for the contact exist? */
 	HWND hwnd = Srmm_FindWindow(hContact);
 	if (hwnd) {
@@ -127,7 +127,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
 	cle.pszService = MS_MSG_READMESSAGE;
 	cle.szTooltip.w = toolTip;
-	g_CLI.pfnAddEvent(&cle);
+	g_clistApi.pfnAddEvent(&cle);
 	return 0;
 }
 
@@ -200,7 +200,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 		mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));
 
 		if (g_dat.bShowTypingClist) {
-			g_CLI.pfnRemoveEvent(hContact, 1);
+			g_clistApi.pfnRemoveEvent(hContact, 1);
 
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
@@ -209,7 +209,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_TYPING);
 			cle.pszService = MS_MSG_READMESSAGE;
 			cle.szTooltip.w = szTip;
-			g_CLI.pfnAddEvent(&cle);
+			g_clistApi.pfnAddEvent(&cle);
 
 			IcoLib_ReleaseIcon(cle.hIcon);
 		}
@@ -304,7 +304,7 @@ static void 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/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 1b4f8867be..eee76499a3 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -408,8 +408,8 @@ void CTabbedWindow::TabClicked()
 		if (s->wState & GC_EVENT_HIGHLIGHT) {
 			s->wState &= ~GC_EVENT_HIGHLIGHT;
 
-			if (g_CLI.pfnGetEvent(s->hContact, 0))
-				g_CLI.pfnRemoveEvent(s->hContact, GC_FAKE_EVENT);
+			if (g_clistApi.pfnGetEvent(s->hContact, 0))
+				g_clistApi.pfnRemoveEvent(s->hContact, GC_FAKE_EVENT);
 		}
 
 		FixTabIcons(pDlg);
-- 
cgit v1.2.3