From a88908d79295c22362b9c66edef2d185b7e64f01 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 18 Jan 2014 16:14:20 +0000 Subject: old useless junk removed git-svn-id: http://svn.miranda-ng.org/main/trunk@7731 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_hotkeys.inc | 11 ++-------- include/m_hotkeys.h | 2 -- plugins/Actman/ua/i_uaplaces.inc | 4 ++-- plugins/Actman30/ua/i_uaplaces.inc | 8 +++---- plugins/QuickSearch/sr_global.pas | 4 ++-- plugins/Watrack/popup/popups.pas | 2 +- plugins/Watrack/status/status.pas | 2 +- plugins/Watrack/templates/i_expkey.inc | 2 +- plugins/mRadio/i_hotkey.inc | 38 +++++++++++++++++----------------- src/modules/skin/hotkeys.cpp | 2 +- 10 files changed, 33 insertions(+), 42 deletions(-) diff --git a/include/delphi/m_hotkeys.inc b/include/delphi/m_hotkeys.inc index e0bda35da1..e838a95118 100644 --- a/include/delphi/m_hotkeys.inc +++ b/include/delphi/m_hotkeys.inc @@ -1,8 +1,8 @@ { Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2007 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-2007 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -39,13 +39,6 @@ type THOTKEYDESC = HOTKEYDESC; PHOTKEYDESC = ^THOTKEYDESC; -const - {$IFNDEF Win64} - HOTKEYDESC_SIZE_V1 = 7*SizeOf(dword); //(offsetof(HOTKEYDESC, dwFlags)) - {$ELSE} - HOTKEYDESC_SIZE_V1 = SizeOf(HOTKEYDESC); - {$ENDIF} - const HKF_MIRANDA_LOCAL = $8000; diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h index 33ebde9817..effe9df65b 100644 --- a/include/m_hotkeys.h +++ b/include/m_hotkeys.h @@ -51,8 +51,6 @@ typedef struct DWORD dwFlags; } HOTKEYDESC; -#define HOTKEYDESC_SIZE_V1 (offsetof(HOTKEYDESC, dwFlags)) - #define HKF_MIRANDA_LOCAL 0x8000 extern int hLangpack; diff --git a/plugins/Actman/ua/i_uaplaces.inc b/plugins/Actman/ua/i_uaplaces.inc index 9ee2a79b0c..806cbe302c 100644 --- a/plugins/Actman/ua/i_uaplaces.inc +++ b/plugins/Actman/ua/i_uaplaces.inc @@ -224,8 +224,8 @@ begin if (ActionItem.flags and UAF_HKREGGED)=0 then begin FillChar(hkd,SizeOf(hkd),0); - hkd.cbSize := SizeOf(hkd); // HOTKEYDESC_SIZE_V1 for pre-0.9 - hkd.dwFlags := HKD_UNICODE; // since 0.9 only + hkd.cbSize := SizeOf(hkd); + hkd.dwFlags := HKD_UNICODE; hkd.pszName := ActionItem.szNameID; hkd.pszDescription.w:= ActionItem.szActDescr; hkd.pszSection .w:= MODULE_NAME; diff --git a/plugins/Actman30/ua/i_uaplaces.inc b/plugins/Actman30/ua/i_uaplaces.inc index 0b8ee9468d..bbd6571aaa 100644 --- a/plugins/Actman30/ua/i_uaplaces.inc +++ b/plugins/Actman30/ua/i_uaplaces.inc @@ -225,8 +225,8 @@ begin if (ActionItem.flags and UAF_HKREGGED)=0 then begin FillChar(hkd,SizeOf(hkd),0); - hkd.cbSize := SizeOf(hkd); // HOTKEYDESC_SIZE_V1 for pre-0.9 - hkd.dwFlags := HKD_UNICODE; // since 0.9 only + hkd.cbSize := SizeOf(hkd); + hkd.dwFlags := HKD_UNICODE; hkd.pszName := ActionItem.szNameID; hkd.pszDescription.w:= ActionItem.szActDescr; hkd.pszSection .w:= MODULE_NAME; @@ -626,8 +626,8 @@ begin if ActionItem.szTTBTooltip =nil then pc1:=pc else pc1:=ActionItem.szTTBTooltip; - - if ((ActionItem.flags and UAF_2STATE)=0) or + + if ((ActionItem.flags and UAF_2STATE)=0) or (ActionItem.szTTBTooltipPressed=nil) then pc2:=pc1 else diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas index 76d9b08de7..fe6a0864e2 100644 --- a/plugins/QuickSearch/sr_global.pas +++ b/plugins/QuickSearch/sr_global.pas @@ -121,7 +121,7 @@ type flags :dword; // QSO_* options end; - + procedure reghotkeys; procedure unreghotkeys; @@ -198,7 +198,7 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=HOTKEYDESC_SIZE_V1; + cbSize :=SizeOf(hkrec); pszName :=HKN_GLOBAL; pszDescription.a:='QuickSearch window hotkey'; pszSection.a :=qs_name; diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index b671c60346..f22a9c44bd 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -319,7 +319,7 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=HOTKEYDESC_SIZE_V1; + cbSize :=SizeOf(hkrec); pszName :=HKN_POPUP; pszDescription.a:='WATrack popup hotkey'; pszSection.a :=PluginName; diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas index 1ffbeb6b84..0bdc7cdcb5 100644 --- a/plugins/Watrack/status/status.pas +++ b/plugins/Watrack/status/status.pas @@ -22,7 +22,7 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=HOTKEYDESC_SIZE_V1; + cbSize :=SizeOf(hkrec); pszName :=HKN_INSERT; pszDescription.a:='Global WATrack hotkey'; pszSection.a :=PluginName; diff --git a/plugins/Watrack/templates/i_expkey.inc b/plugins/Watrack/templates/i_expkey.inc index f6594acebb..960fd1a43e 100644 --- a/plugins/Watrack/templates/i_expkey.inc +++ b/plugins/Watrack/templates/i_expkey.inc @@ -22,7 +22,7 @@ begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do begin - cbSize :=HOTKEYDESC_SIZE_V1; + cbSize :=SizeOf(hkrec); pszName :=HKN_EXPORT; pszDescription.a:='WATrack data insert hotkey'; pszSection.a :=PluginName; diff --git a/plugins/mRadio/i_hotkey.inc b/plugins/mRadio/i_hotkey.inc index 44e4910699..380c714623 100644 --- a/plugins/mRadio/i_hotkey.inc +++ b/plugins/mRadio/i_hotkey.inc @@ -30,33 +30,33 @@ begin FillChar(hkrec,SizeOf(hkrec),0); - hkrec.cbSize :=HOTKEYDESC_SIZE_V1; - hkrec.pszSection.a :=PluginName; - hkrec.pszService :=MS_RADIO_HOTKEY; + hkrec.cbSize := SizeOf(hkrec); + hkrec.pszSection.a := PluginName; + hkrec.pszService := MS_RADIO_HOTKEY; - hkrec.DefHotKey :=DefRadioKeyPlay; - hkrec.pszName :=HKN_PLAYPAUSE; - hkrec.pszDescription.a:='Play/Pause'; - hkrec.lParam :=MRC_PAUSE; + hkrec.DefHotKey := DefRadioKeyPlay; + hkrec.pszName := HKN_PLAYPAUSE; + hkrec.pszDescription.a:= 'Play/Pause'; + hkrec.lParam := MRC_PAUSE; CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); - hkrec.DefHotKey :=DefRadioKeyStop; - hkrec.pszName :=HKN_STOP; - hkrec.pszDescription.a:='Stop'; - hkrec.lParam :=MRC_STOP; + hkrec.DefHotKey := DefRadioKeyStop; + hkrec.pszName := HKN_STOP; + hkrec.pszDescription.a:= 'Stop'; + hkrec.lParam := MRC_STOP; CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); - hkrec.DefHotKey :=DefRadioKeyMute; - hkrec.pszName :=HKN_MUTE; - hkrec.pszDescription.a:='Mute'; - hkrec.lParam :=MRC_MUTE; + hkrec.DefHotKey := DefRadioKeyMute; + hkrec.pszName := HKN_MUTE; + hkrec.pszDescription.a:= 'Mute'; + hkrec.lParam := MRC_MUTE; CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); //?? - hkrec.DefHotKey :=DefRadioKeyRecord; - hkrec.pszName :=HKN_RECORD; - hkrec.pszDescription.a:='Start/Stop Record'; - hkrec.lParam :=MRC_RECORD; + hkrec.DefHotKey := DefRadioKeyRecord; + hkrec.pszName := HKN_RECORD; + hkrec.pszDescription.a:= 'Start/Stop Record'; + hkrec.lParam := MRC_RECORD; CallService(MS_HOTKEY_REGISTER,0,lparam(@hkrec)); end; diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index 95928b7aa3..279466dbf7 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -129,7 +129,7 @@ static INT_PTR svcHotkeyUnsubclass(WPARAM wParam, LPARAM) static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) { HOTKEYDESC *desc = (HOTKEYDESC *)lParam; - if (desc->cbSize != sizeof(HOTKEYDESC) && desc->cbSize != HOTKEYDESC_SIZE_V1) + if (desc->cbSize != sizeof(HOTKEYDESC)) return 0; THotkeyItem *item = (THotkeyItem*)mir_alloc(sizeof(THotkeyItem)); -- cgit v1.2.3