* replaced fvstring with sw_string in validate.inc

git-svn-id: branches/unicodekvm@48596 -
This commit is contained in:
nickysn 2021-02-10 13:40:15 +00:00
parent 1ffb6c6fdf
commit 047b435131

View File

@ -134,11 +134,11 @@ TYPE
Status : Word; { Validator status } Status : Word; { Validator status }
Options: Word; { Validator options } Options: Word; { Validator options }
CONSTRUCTOR Load (Var S: TStream); CONSTRUCTOR Load (Var S: TStream);
FUNCTION Valid(CONST S: FVString): Boolean; FUNCTION Valid(CONST S: Sw_String): Boolean;
FUNCTION IsValid (CONST S: FVString): Boolean; Virtual; FUNCTION IsValid (CONST S: Sw_String): Boolean; Virtual;
FUNCTION IsValidInput (Var S: FVString; FUNCTION IsValidInput (Var S: Sw_String;
SuppressFill: Boolean): Boolean; Virtual; SuppressFill: Boolean): Boolean; Virtual;
FUNCTION Transfer (Var S: FVString; Buffer: Pointer; FUNCTION Transfer (Var S: Sw_String; Buffer: Pointer;
Flag: TVTransfer): Word; Virtual; Flag: TVTransfer): Word; Virtual;
PROCEDURE Error; Virtual; PROCEDURE Error; Virtual;
PROCEDURE Store (Var S: TStream); PROCEDURE Store (Var S: TStream);
@ -151,13 +151,13 @@ TYPE
TYPE TYPE
TPXPictureValidator = OBJECT (TValidator) TPXPictureValidator = OBJECT (TValidator)
Pic: PString; { Picture filename } Pic: PString; { Picture filename }
CONSTRUCTOR Init (Const APic: FVString; AutoFill: Boolean); CONSTRUCTOR Init (Const APic: Sw_String; AutoFill: Boolean);
CONSTRUCTOR Load (Var S: TStream); CONSTRUCTOR Load (Var S: TStream);
DESTRUCTOR Done; Virtual; DESTRUCTOR Done; Virtual;
FUNCTION IsValid (Const S: FVString): Boolean; Virtual; FUNCTION IsValid (Const S: Sw_String): Boolean; Virtual;
FUNCTION IsValidInput (Var S: FVString; FUNCTION IsValidInput (Var S: Sw_String;
SuppressFill: Boolean): Boolean; Virtual; SuppressFill: Boolean): Boolean; Virtual;
FUNCTION Picture (Var Input: FVString; FUNCTION Picture (Var Input: Sw_String;
AutoFill: Boolean): TPicResult; Virtual; AutoFill: Boolean): TPicResult; Virtual;
PROCEDURE Error; Virtual; PROCEDURE Error; Virtual;
PROCEDURE Store (Var S: TStream); PROCEDURE Store (Var S: TStream);
@ -174,8 +174,8 @@ TYPE
ValidChars: CharSet; { Valid char set } ValidChars: CharSet; { Valid char set }
CONSTRUCTOR Init (AValidChars: CharSet); CONSTRUCTOR Init (AValidChars: CharSet);
CONSTRUCTOR Load (Var S: TStream); CONSTRUCTOR Load (Var S: TStream);
FUNCTION IsValid (CONST S: FVString): Boolean; Virtual; FUNCTION IsValid (CONST S: Sw_String): Boolean; Virtual;
FUNCTION IsValidInput (Var S: FVString; FUNCTION IsValidInput (Var S: Sw_String;
SuppressFill: Boolean): Boolean; Virtual; SuppressFill: Boolean): Boolean; Virtual;
PROCEDURE Error; Virtual; PROCEDURE Error; Virtual;
PROCEDURE Store (Var S: TStream); PROCEDURE Store (Var S: TStream);
@ -191,8 +191,8 @@ TYPE
Max: LongInt; { Max valid value } Max: LongInt; { Max valid value }
CONSTRUCTOR Init(AMin, AMax: LongInt); CONSTRUCTOR Init(AMin, AMax: LongInt);
CONSTRUCTOR Load (Var S: TStream); CONSTRUCTOR Load (Var S: TStream);
FUNCTION IsValid (Const S: FVString): Boolean; Virtual; FUNCTION IsValid (Const S: Sw_String): Boolean; Virtual;
FUNCTION Transfer (Var S: FVString; Buffer: Pointer; FUNCTION Transfer (Var S: Sw_String; Buffer: Pointer;
Flag: TVTransfer): Word; Virtual; Flag: TVTransfer): Word; Virtual;
PROCEDURE Error; Virtual; PROCEDURE Error; Virtual;
PROCEDURE Store (Var S: TStream); PROCEDURE Store (Var S: TStream);
@ -204,8 +204,8 @@ TYPE
{---------------------------------------------------------------------------} {---------------------------------------------------------------------------}
TYPE TYPE
TLookupValidator = OBJECT (TValidator) TLookupValidator = OBJECT (TValidator)
FUNCTION IsValid (Const S: FVString): Boolean; Virtual; FUNCTION IsValid (Const S: Sw_String): Boolean; Virtual;
FUNCTION Lookup (Const S: FVString): Boolean; Virtual; FUNCTION Lookup (Const S: Sw_String): Boolean; Virtual;
END; END;
PLookupValidator = ^TLookupValidator; PLookupValidator = ^TLookupValidator;
@ -218,7 +218,7 @@ TYPE
CONSTRUCTOR Init (AStrings: PStringCollection); CONSTRUCTOR Init (AStrings: PStringCollection);
CONSTRUCTOR Load (Var S: TStream); CONSTRUCTOR Load (Var S: TStream);
DESTRUCTOR Done; Virtual; DESTRUCTOR Done; Virtual;
FUNCTION Lookup (Const S: FVString): Boolean; Virtual; FUNCTION Lookup (Const S: Sw_String): Boolean; Virtual;
PROCEDURE Error; Virtual; PROCEDURE Error; Virtual;
PROCEDURE NewStringList (AStrings: PStringCollection); PROCEDURE NewStringList (AStrings: PStringCollection);
PROCEDURE Store (Var S: TStream); PROCEDURE Store (Var S: TStream);