From 6fad3235de6bec045fec19a7265e19e880ac84e2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Jul 2017 17:30:39 +0300 Subject: Hotkeys: code cleaning --- plugins/Watrack/popup/popups.pas | 3 +-- plugins/Watrack/status/status.pas | 3 +-- plugins/Watrack/templates/i_expkey.inc | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'plugins/Watrack') diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index 026f03e82b..8e7782de69 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -297,14 +297,13 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=SizeOf(hkrec); pszName :=HKN_POPUP; pszDescription.a:='WATrack popup hotkey'; pszSection.a :=PluginName; pszService :=MS_WAT_SHOWMUSICINFO; DefHotKey:=((HOTKEYF_ALT or HOTKEYF_CONTROL) shl 8) or VK_F7 or HKF_MIRANDA_LOCAL; end; - CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); + Hotkey_Register(@hkrec); end; {$include pop_dlg.inc} diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas index 81c1f20d9a..101c2dcf8b 100644 --- a/plugins/Watrack/status/status.pas +++ b/plugins/Watrack/status/status.pas @@ -24,7 +24,6 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=SizeOf(hkrec); pszName :=HKN_INSERT; pszDescription.a:='Global WATrack hotkey'; pszSection.a :=PluginName; @@ -32,7 +31,7 @@ begin DefHotKey :=((HOTKEYF_ALT or HOTKEYF_CONTROL) shl 8) or VK_F5; // lParam :=0; end; - CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); + Hotkey_Register(@hkrec); end; {$include i_st_vars.inc} diff --git a/plugins/Watrack/templates/i_expkey.inc b/plugins/Watrack/templates/i_expkey.inc index fd990cda31..c8e589609f 100644 --- a/plugins/Watrack/templates/i_expkey.inc +++ b/plugins/Watrack/templates/i_expkey.inc @@ -22,13 +22,11 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=SizeOf(hkrec); pszName :=HKN_EXPORT; pszDescription.a:='WATrack data insert hotkey'; pszSection.a :=PluginName; pszService :=MS_WAT_EXPORT; DefHotKey :=((HOTKEYF_ALT or HOTKEYF_SHIFT) shl 8) or VK_F7; -// lParam :=0; end; - CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); + Hotkey_Register(@hkrec); end; -- cgit v1.2.3