Skip to content

Commit efef700

Browse files
Zeus64Zeus64
authored
Code formatting (#275)
* code formatting * Code Formatting * Code Formatting * Code Formatting * Code formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting and add 11.3 support
1 parent 29ac7ce commit efef700

File tree

445 files changed

+18312
-14463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+18312
-14463
lines changed

‎CompileAll.bat‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,20 @@ REM -------------------
114114
REM Normalize all units
115115
REM -------------------
116116

117-
call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Source\" -CreateBackup="false"
117+
echo -------------------
118+
echo Normalize all units
119+
echo -------------------
120+
echo.
121+
122+
call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Demos\" -CreateBackup="false" -FilesToIgnore="superxmlparser.pas;supertimezone.pas;superobject.pas;superdate.pas;dwsXPlatform.pas;dwsUtils.pas;dwsJSON.pas" -NoInteraction=true
123+
IF ERRORLEVEL 1 goto ERROR
124+
call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Source\" -FilesToIgnore="ZLibExGZ.pas;ZLibExApi.pas;ZLibEx.pas;Grijjy.SymbolTranslator.pas;Grijjy.ErrorReporting.pas;Alcinoe.FBX.Lib.pas;Alcinoe.FBX.Base.pas" -CreateBackup="false" -NoInteraction=true
125+
IF ERRORLEVEL 1 goto ERROR
126+
call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Tests\" -CreateBackup="false" -NoInteraction=true
118127
IF ERRORLEVEL 1 goto ERROR
128+
call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Tools\" -CreateBackup="false" -NoInteraction=true
129+
IF ERRORLEVEL 1 goto ERROR
130+
echo.
119131

120132

121133
REM -----------------
@@ -391,9 +403,6 @@ IF EXIST "%FileName%" rmdir /s /q "%FileName%"
391403
if exist "%FileName%" goto ERROR
392404
mkdir "%FileName%"
393405

394-
call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%~1\%~2" -CreateBackup="false"
395-
IF ERRORLEVEL 1 goto ERROR
396-
397406
call "%ALBaseDir%\Tools\DProjNormalizer\DProjNormalizer.exe" -DProj="%~1\%~2\%~3" -CreateBackup="false"
398407
IF ERRORLEVEL 1 goto ERROR
399408

‎Demos/ALCipher/_Source/Unit1.pas‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ procedure TForm1.ALButton10Click(Sender: TObject);
175175
end;
176176
end;
177177

178-
{***********************************************}
178+
{************************************************}
179179
procedure TForm1.ALButton11Click(Sender: TObject);
180180
Var aData: AnsiString;
181181
aTmpData: ansiString;
@@ -415,12 +415,13 @@ procedure TForm1.ALButton9Click(Sender: TObject);
415415
ALMemoDeCryptedData.Lines.Text := string(outString);
416416
end;
417417

418+
{*******************************************************}
418419
procedure TForm1.ALMemoCollisionsChange(Sender: TObject);
419420
begin
420421

421422
end;
422423

423-
{*********************************************}
424+
{**********************************************}
424425
procedure TForm1.Button10Click(Sender: TObject);
425426
Var aData: AnsiString;
426427
aBase64Data: AnsiString;
@@ -469,6 +470,7 @@ procedure TForm1.Button10Click(Sender: TObject);
469470
end;
470471
end;
471472

473+
{**********************************************}
472474
procedure TForm1.Button11Click(Sender: TObject);
473475
Var aData: AnsiString;
474476
aHash: ansiString;
@@ -517,6 +519,7 @@ procedure TForm1.Button11Click(Sender: TObject);
517519
end;
518520
end;
519521

522+
{**********************************************}
520523
procedure TForm1.Button12Click(Sender: TObject);
521524
Var aData: ansiString;
522525
aTmpData: ansiString;
@@ -578,6 +581,7 @@ procedure TForm1.Button12Click(Sender: TObject);
578581
end;
579582
end;
580583

584+
{**********************************************}
581585
procedure TForm1.Button13Click(Sender: TObject);
582586
Var aData: String;
583587
aTmpData: String;
@@ -639,6 +643,7 @@ procedure TForm1.Button13Click(Sender: TObject);
639643
end;
640644
end;
641645

646+
{**********************************************}
642647
procedure TForm1.Button14Click(Sender: TObject);
643648
Var aData: String;
644649
aTmpData: String;
@@ -700,6 +705,7 @@ procedure TForm1.Button14Click(Sender: TObject);
700705
end;
701706
end;
702707

708+
{**********************************************}
703709
procedure TForm1.Button15Click(Sender: TObject);
704710
Var aData: String;
705711
aBase64Data: String;
@@ -748,6 +754,7 @@ procedure TForm1.Button15Click(Sender: TObject);
748754
end;
749755
end;
750756

757+
{**********************************************}
751758
procedure TForm1.Button16Click(Sender: TObject);
752759
Var aData: ansiString;
753760
aTmpData: ansiString;
@@ -809,6 +816,7 @@ procedure TForm1.Button16Click(Sender: TObject);
809816
end;
810817
end;
811818

819+
{**********************************************}
812820
procedure TForm1.Button17Click(Sender: TObject);
813821
Var aData: String;
814822
aTmpData: String;
@@ -870,6 +878,7 @@ procedure TForm1.Button17Click(Sender: TObject);
870878
end;
871879
end;
872880

881+
{**********************************************}
873882
procedure TForm1.Button18Click(Sender: TObject);
874883
Var aData: Tbytes;
875884
aData2: Tbytes;
@@ -921,6 +930,7 @@ procedure TForm1.Button18Click(Sender: TObject);
921930
end;
922931
end;
923932

933+
{*********************************************}
924934
procedure TForm1.Button1Click(Sender: TObject);
925935
Var aData: AnsiString;
926936
aTmpData: ansiString;
@@ -1044,6 +1054,7 @@ procedure TForm1.Button2Click(Sender: TObject);
10441054
end;
10451055
end;
10461056

1057+
{*********************************************}
10471058
procedure TForm1.Button9Click(Sender: TObject);
10481059
Var aData: AnsiString;
10491060
aTmpData: ansiString;
@@ -1436,6 +1447,7 @@ procedure TForm1.Button7Click(Sender: TObject);
14361447
end;
14371448
end;
14381449

1450+
{*********************************************}
14391451
procedure TForm1.Button8Click(Sender: TObject);
14401452
Var aData: AnsiString;
14411453
aTmpData: ansiString;

‎Demos/ALConfetti/_Source/ALConfettiDemo.dproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,12 @@
327327
<Form>TMainForm</Form>
328328
<FormType>fmx</FormType>
329329
</DCCReference>
330-
<JavaReference Include="Android\Merged\libs\r.jar"/>
330+
<JavaReference Include="Android\Merged\libs\32bit\r.jar">
331+
<ContainerId>ClassesdexFile</ContainerId>
332+
</JavaReference>
333+
<JavaReference Include="Android\Merged\libs\64bit\r.jar">
334+
<ContainerId>ClassesdexFile64</ContainerId>
335+
</JavaReference>
331336
<BuildConfiguration Include="Base">
332337
<Key>Base</Key>
333338
</BuildConfiguration>

‎Demos/ALConfetti/_Source/Android/Merged/libs/r.jar‎ renamed to ‎Demos/ALConfetti/_Source/Android/Merged/libs/32bit/r.jar‎

File renamed without changes.

‎Demos/ALFmxFilterEffects/_Source/android/Merged/libs/r.jar‎ renamed to ‎Demos/ALConfetti/_Source/Android/Merged/libs/64bit/r.jar‎

File renamed without changes.

‎Demos/ALConfetti/_Source/Main.pas‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ implementation
5858

5959
{$R *.fmx}
6060

61+
{************************************************}
6162
function _randomInRange(min, max: single): Single;
6263
begin
6364
result := random * (max - min) + min;
6465
end;
6566

67+
{**********************************************************}
6668
procedure TTMainForm.BtnFireFireworksClick(Sender: TObject);
6769
begin
6870
if FireworksTimer.Enabled then exit;
@@ -71,6 +73,7 @@ procedure TTMainForm.BtnFireFireworksClick(Sender: TObject);
7173
FireworksTimer.Enabled := True;
7274
end;
7375

76+
{********************************************************}
7477
procedure TTMainForm.FireworksTimerTimer(Sender: TObject);
7578
begin
7679
FireworksTimer.tag := FireworksTimer.tag + NativeInt(FireworksTimer.Interval);
@@ -113,11 +116,13 @@ procedure TTMainForm.FireworksTimerTimer(Sender: TObject);
113116

114117
end;
115118

119+
{************************************************************************************}
116120
procedure TTMainForm.FormPaint(Sender: TObject; Canvas: TCanvas; const ARect: TRectF);
117121
begin
118122
UpdateStatusBar;
119123
end;
120124

125+
{**************************************************************}
121126
procedure TTMainForm.BtnFireRealisticLookClick(Sender: TObject);
122127
begin
123128
Confetti.Fire(
@@ -197,6 +202,7 @@ procedure TTMainForm.BtnFireRealisticLookClick(Sender: TObject);
197202

198203
end;
199204

205+
{************************************************************}
200206
procedure TTMainForm.BtnFireSchoolPrideClick(Sender: TObject);
201207
begin
202208
if SchoolPrideTimer.Enabled then exit;
@@ -205,6 +211,7 @@ procedure TTMainForm.BtnFireSchoolPrideClick(Sender: TObject);
205211
SchoolPrideTimer.Enabled := True;
206212
end;
207213

214+
{**********************************************************}
208215
procedure TTMainForm.SchoolPrideTimerTimer(Sender: TObject);
209216
begin
210217

@@ -247,6 +254,7 @@ procedure TTMainForm.SchoolPrideTimerTimer(Sender: TObject);
247254

248255
end;
249256

257+
{*****************************************************}
250258
procedure TTMainForm.BtnFireSnowClick(Sender: TObject);
251259
begin
252260
if SnowTimer.Enabled then exit;
@@ -257,6 +265,7 @@ procedure TTMainForm.BtnFireSnowClick(Sender: TObject);
257265
SnowTimer.Enabled := True;
258266
end;
259267

268+
{************************************************************}
260269
procedure TTMainForm.BtnRandomDirectionClick(Sender: TObject);
261270
begin
262271
Confetti.Fire(
@@ -275,16 +284,18 @@ procedure TTMainForm.BtnRandomDirectionClick(Sender: TObject);
275284
1); // const AScalar: Single = 1)
276285
end;
277286

287+
{***************************************************}
278288
procedure TTMainForm.ConfettiFinish(Sender: TObject);
279289
begin
280290
UpdateStatusBar;
281291
TThread.ForceQueue(nil,
282-
procedure
283-
begin
284-
invalidate;
285-
end);
292+
procedure
293+
begin
294+
invalidate;
295+
end);
286296
end;
287297

298+
{***************************************************}
288299
procedure TTMainForm.SnowTimerTimer(Sender: TObject);
289300
begin
290301

@@ -316,6 +327,7 @@ procedure TTMainForm.SnowTimerTimer(Sender: TObject);
316327

317328
end;
318329

330+
{***********************************}
319331
procedure TTMainForm.UpdateStatusBar;
320332
begin
321333
var LAverageFPS: Double := 0;
@@ -348,13 +360,16 @@ procedure TTMainForm.UpdateStatusBar;
348360
end;
349361
end;
350362

363+
{*************************************************************}
351364
procedure TTMainForm.BtnFireCustomConfigClick(Sender: TObject);
352365

366+
{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}
353367
Function _StrToColors(const AStr: String): TArray<TalphaColor>;
354368
begin
355369
result := []; // Im lazzy
356370
end;
357371

372+
{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}
358373
Function _StrToShapes(const AStr: String): TArray<TALConfetti.TParticule.TShape>;
359374
begin
360375
result := []; // Im lazzy

0 commit comments

Comments
 (0)