Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 07:45:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed PFormatSettings definition and renamed to PTProFormatSettings to avoid name clashing
Some checks are pending
TOC Generator / TOC Generator (push) Waiting to run
Details

Browse Source
This commit is contained in:
Daniele Teti 2024-11-10 11:56:29 +01:00
parent e1f9c8ccec
commit c199449ad5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sources/TemplatePro.pas
View File

@ -120,11 +120,7 @@ type
TTProCompiledTemplateGetValueEvent = reference to procedure(const DataSource, Members: string; var Value: TValue; TTProCompiledTemplateGetValueEvent = reference to procedure(const DataSource, Members: string; var Value: TValue;
var Handled: Boolean); var Handled: Boolean);
{$IF CompilerVersion < 36} PTProFormatSettings = ^TFormatSettings;
{ Before Delphi 12 Athens, PFormatSettings wasn't defined}
PFormatSettings = ^TFormatSettings;
{$ENDIF}
ITProCompiledTemplate = interface ITProCompiledTemplate = interface
['{0BE04DE7-6930-456B-86EE-BFD407BA6C46}'] ['{0BE04DE7-6930-456B-86EE-BFD407BA6C46}']
@ -139,9 +135,9 @@ type
function GetOnGetValue: TTProCompiledTemplateGetValueEvent; function GetOnGetValue: TTProCompiledTemplateGetValueEvent;
procedure SetOnGetValue(const Value: TTProCompiledTemplateGetValueEvent); procedure SetOnGetValue(const Value: TTProCompiledTemplateGetValueEvent);
property OnGetValue: TTProCompiledTemplateGetValueEvent read GetOnGetValue write SetOnGetValue; property OnGetValue: TTProCompiledTemplateGetValueEvent read GetOnGetValue write SetOnGetValue;
function GetFormatSettings: PFormatSettings; function GetFormatSettings: PTProFormatSettings;
procedure SetFormatSettings(const Value: PFormatSettings); procedure SetFormatSettings(const Value: PTProFormatSettings);
property FormatSettings: PFormatSettings read GetFormatSettings write SetFormatSettings; property FormatSettings: PTProFormatSettings read GetFormatSettings write SetFormatSettings;
end; end;
TTProCompiledTemplateEvent = reference to procedure(const TemplateProCompiledTemplate: ITProCompiledTemplate); TTProCompiledTemplateEvent = reference to procedure(const TemplateProCompiledTemplate: ITProCompiledTemplate);
@ -198,8 +194,8 @@ type
function EvaluateValue(var Idx: Int64; out MustBeEncoded: Boolean): TValue; function EvaluateValue(var Idx: Int64; out MustBeEncoded: Boolean): TValue;
procedure SetOnGetValue(const Value: TTProCompiledTemplateGetValueEvent); procedure SetOnGetValue(const Value: TTProCompiledTemplateGetValueEvent);
procedure DoOnGetValue(const DataSource, Members: string; var Value: TValue; var Handled: Boolean); procedure DoOnGetValue(const DataSource, Members: string; var Value: TValue; var Handled: Boolean);
function GetFormatSettings: PFormatSettings; function GetFormatSettings: PTProFormatSettings;
procedure SetFormatSettings(const Value: PFormatSettings); procedure SetFormatSettings(const Value: PTProFormatSettings);
class procedure InternalDumpToFile(const FileName: String; const aTokens: TList<TToken>); class procedure InternalDumpToFile(const FileName: String; const aTokens: TList<TToken>);
public public
destructor Destroy; override; destructor Destroy; override;
@ -212,7 +208,7 @@ type
procedure AddFilter(const FunctionName: string; const FunctionImpl: TTProTemplateFunction); overload; procedure AddFilter(const FunctionName: string; const FunctionImpl: TTProTemplateFunction); overload;
procedure AddFilter(const FunctionName: string; const AnonFunctionImpl: TTProTemplateAnonFunction); overload; procedure AddFilter(const FunctionName: string; const AnonFunctionImpl: TTProTemplateAnonFunction); overload;
procedure DumpToFile(const FileName: String); procedure DumpToFile(const FileName: String);
property FormatSettings: PFormatSettings read GetFormatSettings write SetFormatSettings; property FormatSettings: PTProFormatSettings read GetFormatSettings write SetFormatSettings;
property OnGetValue: TTProCompiledTemplateGetValueEvent read GetOnGetValue write SetOnGetValue; property OnGetValue: TTProCompiledTemplateGetValueEvent read GetOnGetValue write SetOnGetValue;
end; end;
@ -489,7 +485,7 @@ begin
end; end;
end; end;
function TTProCompiledTemplate.GetFormatSettings: PFormatSettings; function TTProCompiledTemplate.GetFormatSettings: PTProFormatSettings;
begin begin
Result := @fLocaleFormatSettings; Result := @fLocaleFormatSettings;
end; end;
@ -3263,7 +3259,7 @@ begin
end; end;
procedure TTProCompiledTemplate.SetFormatSettings(const Value: PFormatSettings); procedure TTProCompiledTemplate.SetFormatSettings(const Value: PTProFormatSettings);
begin begin
fLocaleFormatSettings := Value^; fLocaleFormatSettings := Value^;
end; end;