From f13006c7f24582ffa37bf77c101609841000cb1d Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 7 Mar 2009 15:17:58 +0000 Subject: [PATCH] * changed the output parameters of a bunch of *tofloat() and trystrtocurr() from var to out (mantis #13289) git-svn-id: trunk@12862 - --- rtl/objpas/sysutils/sysstr.inc | 22 +++++++++++----------- rtl/objpas/sysutils/sysstrh.inc | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/rtl/objpas/sysutils/sysstr.inc b/rtl/objpas/sysutils/sysstr.inc index ceb878293a..3ab830776a 100644 --- a/rtl/objpas/sysutils/sysstr.inc +++ b/rtl/objpas/sysutils/sysstr.inc @@ -1038,7 +1038,7 @@ begin Result:=Default; end; -Function TextToFloat(Buffer: PChar; Var Value: Extended; Const FormatSettings: TFormatSettings): Boolean; +Function TextToFloat(Buffer: PChar; Out Value: Extended; Const FormatSettings: TFormatSettings): Boolean; Var E,P : Integer; @@ -1063,19 +1063,19 @@ Begin Result:=(E=0); End; -Function TextToFloat(Buffer: PChar; Var Value: Extended): Boolean; +Function TextToFloat(Buffer: PChar; Out Value: Extended): Boolean; begin Result:=TextToFloat(Buffer,Value,DefaultFormatSettings); end; -Function TextToFloat(Buffer: PChar; Var Value; ValueType: TFloatValue): Boolean; +Function TextToFloat(Buffer: PChar; Out Value; ValueType: TFloatValue): Boolean; begin Result:=TextToFloat(Buffer,Value,ValueType,DefaultFormatSettings); end; -Function TextToFloat(Buffer: PChar; Var Value; ValueType: TFloatValue; Const FormatSettings: TFormatSettings): Boolean; +Function TextToFloat(Buffer: PChar; Out Value; ValueType: TFloatValue; Const FormatSettings: TFormatSettings): Boolean; Var E,P : Integer; @@ -1120,36 +1120,36 @@ Begin Result:=(E=0); End; -Function TryStrToFloat(Const S : String; Var Value: Single): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Single): Boolean; begin Result:=TryStrToFloat(S,Value,DefaultFormatSettings); end; -Function TryStrToFloat(Const S : String; Var Value: Single; Const FormatSettings: TFormatSettings): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Single; Const FormatSettings: TFormatSettings): Boolean; Begin Result := TextToFloat(PChar(pointer(S)), Value, fvSingle,FormatSettings); End; -Function TryStrToFloat(Const S : String; Var Value: Double): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Double): Boolean; begin Result:=TryStrToFloat(S,Value,DefaultFormatSettings); end; -Function TryStrToFloat(Const S : String; Var Value: Double; Const FormatSettings: TFormatSettings): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Double; Const FormatSettings: TFormatSettings): Boolean; Begin Result := TextToFloat(PChar(pointer(S)), Value, fvDouble,FormatSettings); End; {$ifdef FPC_HAS_TYPE_EXTENDED} -Function TryStrToFloat(Const S : String; Var Value: Extended): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Extended): Boolean; begin Result:=TryStrToFloat(S,Value,DefaultFormatSettings); end; -Function TryStrToFloat(Const S : String; Var Value: Extended; Const FormatSettings: TFormatSettings): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Extended; Const FormatSettings: TFormatSettings): Boolean; Begin Result := TextToFloat(PChar(pointer(S)), Value,FormatSettings); End; @@ -1680,7 +1680,7 @@ begin end; -Function TryStrToCurr(Const S : String; Var Value: Currency): Boolean; +Function TryStrToCurr(Const S : String; Out Value: Currency): Boolean; Begin Result := TextToFloat(PChar(pointer(S)), Value, fvCurrency); End; diff --git a/rtl/objpas/sysutils/sysstrh.inc b/rtl/objpas/sysutils/sysstrh.inc index 8cdb68c3fe..579ab3ec90 100644 --- a/rtl/objpas/sysutils/sysstrh.inc +++ b/rtl/objpas/sysutils/sysstrh.inc @@ -175,18 +175,18 @@ Function StrToFloat(Const S : String) : Extended; Function StrToFloat(Const S : String; Const FormatSettings: TFormatSettings) : Extended; Function StrToFloatDef(Const S: String; Const Default: Extended): Extended; Function StrToFloatDef(Const S: String; Const Default: Extended; Const FormatSettings: TFormatSettings): Extended; -Function TryStrToFloat(Const S : String; Var Value: Single): Boolean; -Function TryStrToFloat(Const S : String; Var Value: Single; Const FormatSettings: TFormatSettings): Boolean; -Function TryStrToFloat(Const S : String; Var Value: Double): Boolean; -Function TryStrToFloat(Const S : String; Var Value: Double; Const FormatSettings: TFormatSettings): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Single): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Single; Const FormatSettings: TFormatSettings): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Double): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Double; Const FormatSettings: TFormatSettings): Boolean; {$ifdef FPC_HAS_TYPE_EXTENDED} -Function TryStrToFloat(Const S : String; Var Value: Extended): Boolean; -Function TryStrToFloat(Const S : String; Var Value: Extended; Const FormatSettings: TFormatSettings): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Extended): Boolean; +Function TryStrToFloat(Const S : String; Out Value: Extended; Const FormatSettings: TFormatSettings): Boolean; {$endif FPC_HAS_TYPE_EXTENDED} -Function TextToFloat(Buffer: PChar; Var Value: Extended): Boolean; -Function TextToFloat(Buffer: PChar; Var Value: Extended; Const FormatSettings: TFormatSettings): Boolean; -Function TextToFloat(Buffer: PChar; Var Value; ValueType: TFloatValue): Boolean; -Function TextToFloat(Buffer: PChar; Var Value; ValueType: TFloatValue; Const FormatSettings: TFormatSettings): Boolean; +Function TextToFloat(Buffer: PChar; Out Value: Extended): Boolean; +Function TextToFloat(Buffer: PChar; Out Value: Extended; Const FormatSettings: TFormatSettings): Boolean; +Function TextToFloat(Buffer: PChar; Out Value; ValueType: TFloatValue): Boolean; +Function TextToFloat(Buffer: PChar; Out Value; ValueType: TFloatValue; Const FormatSettings: TFormatSettings): Boolean; Function FloatToText(Buffer: PChar; Value: Extended; format: TFloatFormat; Precision, Digits: Integer): Longint; Function FloatToText(Buffer: PChar; Value: Extended; format: TFloatFormat; Precision, Digits: Integer; Const FormatSettings: TFormatSettings): Longint; Function FloatToDateTime (Const Value : Extended) : TDateTime; @@ -195,7 +195,7 @@ function TryFloatToCurr(const Value: Extended; var AResult: Currency): Boolean; Function CurrToStr(Value: Currency): string; function StrToCurr(const S: string): Currency; -function TryStrToCurr(const S: string;Var Value : Currency): Boolean; +function TryStrToCurr(const S: string;Out Value : Currency): Boolean; function StrToCurrDef(const S: string; Default : Currency): Currency; Function FloatToTextFmt(Buffer: PChar; Value: Extended; format: PChar; FormatSettings : TFormatSettings): Integer;