From ad2a5992f1fa9558ad653f8d5c81896472ce8363 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 4 Apr 2018 21:49:37 +0300
Subject: - CLIST_INTERFACE::pfnGetProtocolMenu => Menu_GetProtocolMenu

- CLIST_INTERFACE::pfnReloadProtoMenus => Menu_ReloadProtoMenus
- CLIST_INTERFACE::pfnGetProtoIndexByPos considered unused... thus removed
---
 plugins/CSList/src/cslist.cpp                          | 4 ++--
 plugins/Clist_modern/src/init.cpp                      | 2 +-
 plugins/SimpleStatusMsg/src/options.cpp                | 2 +-
 plugins/StatusManager/src/StartupStatus/ss_options.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index cf4a830c2a..092bc18f5e 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -72,7 +72,7 @@ static int OnDbChanged(WPARAM hContact, LPARAM lparam)
 	if (hContact == NULL) {
 		const char *szUniqueID = Proto_GetUniqueId(cws->szModule);
 		if (!mir_strcmp(cws->szSetting, szUniqueID))
-			pcli->pfnReloadProtoMenus();
+			Menu_ReloadProtoMenus();
 	}
 	return 0;
 }
@@ -1020,7 +1020,7 @@ INT_PTR CALLBACK CSOptionsProc(HWND hwnd, UINT message, WPARAM, LPARAM lparam)
 			setByte("DeleteAfterImport", IsDlgButtonChecked(hwnd, IDC_DELETE_AFTER_IMPORT) ? 1 : 0);
 			setByte("RememberWindowPosition", IsDlgButtonChecked(hwnd, IDC_REMEMBER_POSITION) ? 1 : 0);
 
-			pcli->pfnReloadProtoMenus();
+			Menu_ReloadProtoMenus();
 			break;
 		}
 		return TRUE;
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 553f41a45a..1f75296eef 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -135,7 +135,7 @@ static HRESULT SubclassClistInterface()
 	corecli = *pcli;
 
 	pcli->hInst = g_hInst;
-	pcli->bDisplayLocked = TRUE;
+	pcli->bDisplayLocked = true;
 
 	pcli->pfnCreateCacheItem = cliCreateCacheItem;
 	pcli->pfnCheckCacheItem = cliCheckCacheItem;
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index 22dcf788f7..ff40aa54f8 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 static void RebuildStatusMenu(void)
 {
-	pcli->pfnReloadProtoMenus();
+	Menu_ReloadProtoMenus();
 }
 
 static LRESULT CALLBACK OptEditBoxSubProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
diff --git a/plugins/StatusManager/src/StartupStatus/ss_options.cpp b/plugins/StatusManager/src/StartupStatus/ss_options.cpp
index 1b401cdca7..6951b14ba3 100644
--- a/plugins/StatusManager/src/StartupStatus/ss_options.cpp
+++ b/plugins/StatusManager/src/StartupStatus/ss_options.cpp
@@ -718,7 +718,7 @@ public:
 
 		// Rebuild status menu
 		if (bNeedRebuildMenu)
-			pcli->pfnReloadProtoMenus();
+			Menu_ReloadProtoMenus();
 	}
 
 	// add a profile
-- 
cgit v1.2.3