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

---
 plugins/Scriver/src/chat_window.cpp |  8 ++++----
 plugins/Scriver/src/msgdialog.cpp   |  2 +-
 plugins/Scriver/src/msglog.cpp      |  2 +-
 plugins/Scriver/src/msgs.cpp        | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins/Scriver/src')

diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp
index afd499701b..87c4868053 100644
--- a/plugins/Scriver/src/chat_window.cpp
+++ b/plugins/Scriver/src/chat_window.cpp
@@ -922,8 +922,8 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		if (m_si->wState & GC_EVENT_HIGHLIGHT) {
 			m_si->wState &= ~GC_EVENT_HIGHLIGHT;
 
-			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);
 		}
 
 		FixTabIcons();
@@ -1017,8 +1017,8 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 		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);
 		break;
 
 	case WM_NOTIFY:
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 8feedac031..b008fa924b 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1308,7 +1308,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 				DBEVENTINFO dbei = {};
 				db_event_get(hDbEvent, &dbei);
 				if (!(dbei.flags & DBEF_SENT) && (DbEventIsMessageOrCustom(&dbei) || dbei.eventType == EVENTTYPE_URL))
-					g_CLI.pfnRemoveEvent(m_hContact, hDbEvent);
+					g_clistApi.pfnRemoveEvent(m_hContact, hDbEvent);
 				hDbEvent = db_event_next(m_hContact, hDbEvent);
 			}
 		}
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 15de2e0439..fdc59bc513 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -128,7 +128,7 @@ EventData* getEventFromDB(CSrmmWindow *dat, MCONTACT hContact, MEVENT hDbEvent)
 	evt->custom = DbEventIsCustomForMsgWindow(&dbei);
 	if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_URL || evt->custom)) {
 		db_event_markRead(hContact, hDbEvent);
-		g_CLI.pfnRemoveEvent(hContact, hDbEvent);
+		g_clistApi.pfnRemoveEvent(hContact, hDbEvent);
 	}
 	else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE)
 		db_event_markRead(hContact, hDbEvent);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index fcd32c8d2e..e5f4ca310e 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -102,7 +102,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	if (dbei.flags & DBEF_SENT || !DbEventIsMessageOrCustom(&dbei))
 		return 0;
 
-	g_CLI.pfnRemoveEvent(hContact, 1);
+	g_clistApi.pfnRemoveEvent(hContact, 1);
 	/* does a window for the contact exist? */
 	if (hwnd == nullptr) {
 		/* new message */
@@ -123,7 +123,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;
 }
@@ -197,7 +197,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 		wchar_t szTip[256];
 		mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));
 		if (g_dat.flags2 & SMF2_SHOWTYPINGCLIST) {
-			g_CLI.pfnRemoveEvent(hContact, 1);
+			g_clistApi.pfnRemoveEvent(hContact, 1);
 
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
@@ -206,7 +206,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 			cle.hIcon = GetCachedIcon("scriver_TYPING");
 			cle.pszService = MS_MSG_TYPINGMESSAGE;
 			cle.szTooltip.w = szTip;
-			g_CLI.pfnAddEvent(&cle);
+			g_clistApi.pfnAddEvent(&cle);
 		}
 		else Clist_TrayNotifyW(nullptr, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4);
 	}
@@ -280,7 +280,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);
 	}
 }
 
-- 
cgit v1.2.3