From f1cfe61d6edf98e49fab768801bb03b419cee555 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 27 Aug 2006 19:18:13 +0000 Subject: [PATCH] * renamed sqr to sqrt, fixes 7278 git-svn-id: trunk@4513 - --- ide/fpcalc.pas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ide/fpcalc.pas b/ide/fpcalc.pas index 84b026ed67..c479fc7fe9 100644 --- a/ide/fpcalc.pas +++ b/ide/fpcalc.pas @@ -308,7 +308,7 @@ begin { Status := csValid;} GetDisplay(R); if Key='1/X' then begin if R=0 then Error else SetDisplay(1/R,false) end else - if Key='SQR' then begin if R<0 then Error else SetDisplay(sqrt(R),false) end else + if Key='SQRT' then begin if R<0 then Error else SetDisplay(sqrt(R),false) end else if Key='LOG' then begin if R<=0 then Error else SetDisplay(ln(R),false) end else if Key='X^2' then SetDisplay(R*R,false) else if Key='M+' then Memory:=Memory+R else @@ -464,11 +464,11 @@ end; constructor TCalculator.Init; const - Keys: array[0..29] of string[3] = + Keys: array[0..29] of string[4] = ('M+', 'x^y','C' ,#27 ,'%' ,#241 , 'M-', 'x^2','7' ,'8' ,'9' ,'/' , 'M'#26,'1/x','4' ,'5' ,'6' ,'*' , - 'M'#27,'sqr','1' ,'2' ,'3' ,'-' , + 'M'#27,'sqrt','1' ,'2' ,'3' ,'-' , 'M'#29,'log','0' ,'.' ,'=' ,'+' ); var I: Integer;