From 6fad3235de6bec045fec19a7265e19e880ac84e2 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 30 Jul 2017 17:30:39 +0300
Subject: Hotkeys: code cleaning

---
 plugins/SpellChecker/src/spellchecker.cpp | 6 +++---
 plugins/SpellChecker/src/utils.cpp        | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'plugins/SpellChecker/src')

diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp
index 63d7ab3304..4726369e2b 100644
--- a/plugins/SpellChecker/src/spellchecker.cpp
+++ b/plugins/SpellChecker/src/spellchecker.cpp
@@ -211,10 +211,10 @@ static int ModulesLoaded(WPARAM, LPARAM)
 		Srmm_AddIcon(&sid);
 	}
 
-	HOTKEYDESC hkd = { sizeof(hkd) };
+	HOTKEYDESC hkd = {};
 	hkd.pszName = "Spell Checker/Toggle";
-	hkd.pszSection = LPGEN("Spell Checker");
-	hkd.pszDescription = LPGEN("Enable/disable spell checker");
+	hkd.szSection.a = LPGEN("Spell Checker");
+	hkd.szDescription.a = LPGEN("Enable/disable spell checker");
 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_ALT, 'S');
 	hkd.lParam = HOTKEY_ACTION_TOGGLE;
 	Hotkey_Register(&hkd);
diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp
index 6c1e6dd82c..0c62b9e307 100644
--- a/plugins/SpellChecker/src/utils.cpp
+++ b/plugins/SpellChecker/src/utils.cpp
@@ -552,13 +552,8 @@ LRESULT CALLBACK EditProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		return -1;
 
 	// Hotkey support
-	MSG msgData = { 0 };
-	msgData.hwnd = hwnd;
-	msgData.message = msg;
-	msgData.wParam = wParam;
-	msgData.lParam = lParam;
-
-	int action = CallService(MS_HOTKEY_CHECK, (WPARAM)&msgData, (LPARAM)"Spell Checker");
+	MSG msgData = { hwnd, msg, wParam, lParam };
+	int action = Hotkey_Check(&msgData, "Spell Checker");
 	if (action == HOTKEY_ACTION_TOGGLE) {
 		ToggleEnabled(dlg);
 		return 1;
-- 
cgit v1.2.3