Delphi 10.2 Tokyo compatibility fix (#805)

danieleteti · Jan 20, 2025 · bcb4af1 · bcb4af1
1 parent e3f31e4
commit bcb4af1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/ideexpert/DMVC.Expert.Forms.NewProjectWizard.pas b/ideexpert/DMVC.Expert.Forms.NewProjectWizard.pas
@@ -32,7 +32,7 @@
 
 unit DMVC.Expert.Forms.NewProjectWizard;
 
-{$I dmvcframework.inc}
+{$I ..\sources\dmvcframework.inc}
 
 interface
 

diff --git a/sources/MVCFramework.HTMX.pas b/sources/MVCFramework.HTMX.pas
@@ -433,12 +433,13 @@ function THTMXResponseHelper.HXTriggerClientEvents(EventsDescriptors: TJSONObjec
 function THTMXResponseHelper.HXTriggerClientEvents(Names: TArray<string>; After: TClientEventType): TMVCWebResponse;
 var
   Value: string;
+  I: Integer;
 begin
   if Length(Names) = 0 then
     Exit(Self);
 
   Value := Names[0];
-  for var I := Low(Names) + 1 to High(Names) do
+  for I := Low(Names) + 1 to High(Names) do
     Value := Value + ', ' + Names[I];
 
   SetCustomHeader(ClientEventTypes[After], Value);

diff --git a/sources/MVCFramework.IntfObjectPool.pas b/sources/MVCFramework.IntfObjectPool.pas
@@ -253,9 +253,11 @@ procedure TIntfCleanupThread<IInterface>.Execute;
 
 function TIntfCleanupThread<IInterface>.GetAveragePoolSize(
   var SizeSamples: TPoolSizeSamples): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
-  for var I := Low(TPoolSizeSamples) to High(TPoolSizeSamples) do
+  for I := Low(TPoolSizeSamples) to High(TPoolSizeSamples) do
   begin
     Inc(Result, SizeSamples[I]);
   end;

diff --git a/sources/MVCFramework.ObjectPool.pas b/sources/MVCFramework.ObjectPool.pas
@@ -253,9 +253,11 @@ procedure TCleanupThread<T>.Execute;
 
 function TCleanupThread<T>.GetAveragePoolSize(
   var SizeSamples: TPoolSizeSamples): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
-  for var I := Low(TPoolSizeSamples) to High(TPoolSizeSamples) do
+  for I := Low(TPoolSizeSamples) to High(TPoolSizeSamples) do
   begin
     Inc(Result, SizeSamples[I]);
   end;

diff --git a/sources/MVCFramework.View.Renderers.Mustache.pas b/sources/MVCFramework.View.Renderers.Mustache.pas
@@ -79,6 +79,7 @@   TMVCMustacheHelpers = class sealed
 implementation
 
 uses
+  Types,
   JsonDataObjects,
   MVCFramework.Serializer.Defaults,
   MVCFramework.Serializer.Intf,
@@ -171,7 +172,7 @@ procedure TMVCMustacheViewEngine.LoadPartials;
   lViewsExtension: string;
   lViewPath: string;
   lPartialName: String;
-  lPartialFileNames: TArray<string>;
+  lPartialFileNames: TStringDynArray;
   I: Integer;
 begin
   if gPartialsLoaded then