mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Comparing hotkeys parameters and silence some compiler warnings.

Browse source
This commit is contained in:
cobines 2012-04-01 10:17:17 +00:00
commit 9dcce442bc
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/uhotkeymanager.pas
View file

@ -48,6 +48,7 @@ type
Shortcut: String;
Command: String;
Params: array of String;
function Clone: THotkey;
function HasParam(const aParam: String): Boolean; overload;
function HasParam(const aParams: array of String): Boolean; overload;
function SameParams(const aParams: array of String): Boolean;
@ -209,6 +210,14 @@ uses
{ THotkey }
function THotkey.Clone: THotkey;
begin
Result := THotkey.Create;
Result.Shortcut := Shortcut;
Result.Command := Command;
Result.Params := Copy(Params);
end;
function THotkey.HasParam(const aParams: array of String): Boolean;
begin
Result := ContainsOneOf(Params, aParams);
@ -269,7 +278,7 @@ procedure THotkeys.AddIfNotExists(const ShortcutsWithParams: array of String; Co
var
s: String;
ShortCut: String = '';
Params: array of String;
Params: array of String = nil;
begin
// Check if a different shortcut isn't already assigned to the command.
if Assigned(FindByCommand(Command)) then
@ -358,7 +367,7 @@ begin
Result := Items[i];
if (Result.ShortCut = Hotkey.Shortcut) and
(Result.Command = Hotkey.Command) and
(Result.Params = Hotkey.Params) then
(Result.SameParams(Hotkey.Params)) then
Exit;
end;
Result := nil;
@ -769,7 +778,8 @@ var
procedure LoadHotkey(Hotkeys: THotkeys; Node: TXmlNode);
var
Shortcut, Command, Param: String;
Controls, Params: array of String;
Params: array of String = nil;
Controls: array of String = nil;
HMControl: THMControl;
i: Integer;
begin