Changeset 423 for trunk/Packages/Common

Timestamp:

Apr 25, 2022, 6:01:01 PM (3 years ago)

Author:

chronos

Message:

• Modified: Do not use explicit mode delphi directive as it is already set in project.
• Modified: Use UNIX instead of LINUX for conditional code to work also on FreeBSD.

Location:

trunk/Packages/Common

Files:

• StopWatch.pas (modified) (3 diffs)
• UAboutDialog.pas (modified) (1 diff)
• UApplicationInfo.pas (modified) (2 diffs)
• UCommon.pas (modified) (8 diffs)
• UDebugLog.pas (modified) (2 diffs)
• UDelay.pas (modified) (1 diff)
• UFindFile.pas (modified) (1 diff)
• UFormAbout.pas (modified) (1 diff)
• UGeometric.pas (modified) (2 diffs)
• UJobProgressView.pas (modified) (1 diff)
• ULanguages.pas (modified) (1 diff)
• ULastOpenedList.pas (modified) (1 diff)
• UListViewSort.pas (modified) (1 diff)
• UMemory.pas (modified) (2 diffs)
• UMetaCanvas.pas (modified) (1 diff)
• UPersistentForm.pas (modified) (1 diff)
• UPool.pas (modified) (1 diff)
• UPrefixMultiplier.pas (modified) (1 diff)
• URegistry.pas (modified) (2 diffs)
• UResetableThread.pas (modified) (1 diff)
• UScaleDPI.pas (modified) (2 diffs)
• USyncCounter.pas (modified) (2 diffs)
• UThreading.pas (modified) (1 diff)
• UTranslator.pas (modified) (1 diff)
• UURI.pas (modified) (2 diffs)
• UXMLUtils.pas (modified) (1 diff)

trunk/Packages/Common/StopWatch.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF Windows}Windows,{$ENDIF}
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
   SysUtils, DateUtils;
 
@@ -32 +32 @@
   end;
 
+
 implementation
 
@@ -40 +41 @@
   fIsRunning := False;
 
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   fIsHighResolution := QueryPerformanceFrequency(fFrequency) ;
   {$ELSE}

trunk/Packages/Common/UAboutDialog.pas

@@ -1 +1 @@
 unit UAboutDialog;
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UApplicationInfo.pas

@@ -1 +1 @@
 unit UApplicationInfo;
-
-{$mode delphi}
 
 interface
@@ -59 +57 @@
 procedure Register;
 
+
 implementation
 

trunk/Packages/Common/UCommon.pas

@@ -1 +1 @@
 unit UCommon;
 
-{$mode delphi}
-
 interface
 
 uses
-  {$ifdef Windows}Windows,{$endif}
-  {$ifdef Linux}baseunix,{$endif}
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
+  {$IFDEF UNIX}baseunix,{$ENDIF}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
@@ -35 +33 @@
   DLLHandle1: HModule;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
   GetUserNameEx: procedure (NameFormat: DWORD;
     lpNameBuffer: LPSTR; nSize: PULONG); stdcall;
@@ -302 +300 @@
 end;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
 function GetUserName: string;
 const
@@ -323 +321 @@
   end;
 end;
-{$endif}
+{$ENDIF}
 
 function ComputerName: string;
-{$ifdef mswindows}
+{$IFDEF WINDOWS}
 const
  INFO_BUFFER_SIZE = 32767;
@@ -341 +339 @@
   end;
 end;
-{$endif}
-{$ifdef unix}
+{$ENDIF}
+{$IFDEF UNIX}
 var
   Name: UtsName;
@@ -349 +347 @@
   Result := Name.Nodename;
 end;
-{$endif}
-
-{$ifdef windows}
+{$ENDIF}
+
+{$IFDEF WINDOWS}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -429 +427 @@
 procedure LoadLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   DLLHandle1 := LoadLibrary('secur32.dll');
   if DLLHandle1 <> 0 then
@@ -440 +438 @@
 procedure FreeLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   if DLLHandle1 <> 0 then FreeLibrary(DLLHandle1);
   {$ENDIF}

trunk/Packages/Common/UDebugLog.pas

@@ -1 +1 @@
 unit UDebugLog; 
-
-{$mode delphi}
 
 interface
@@ -44 +42 @@
 
 procedure Register;
+
 
 implementation

trunk/Packages/Common/UDelay.pas

@@ -1 +1 @@
 unit UDelay;
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UFindFile.pas

@@ -59 +59 @@
   FilterAll = '*.*';
 {$ENDIF}
-{$IFDEF LINUX}
+{$IFDEF UNIX}
   FilterAll = '*';
 {$ENDIF}

trunk/Packages/Common/UFormAbout.pas

@@ -1 +1 @@
 unit UFormAbout;
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UGeometric.pas

@@ -1 +1 @@
 unit UGeometric;
-
-{$mode delphi}
 
 interface
@@ -26 +24 @@
 function RectEnlarge(Rect: TRect; Value: Integer): TRect;
 function ShiftRect(ARect: TRect; Delta: TPoint): TRect;
+
 
 implementation

trunk/Packages/Common/UJobProgressView.pas

@@ -1 +1 @@
 unit UJobProgressView;
-
-{$MODE Delphi}
 
 interface

trunk/Packages/Common/ULanguages.pas

@@ -1 +1 @@
 unit ULanguages;
-
-{$mode delphi}{$H+}
 
 interface

trunk/Packages/Common/ULastOpenedList.pas

@@ -1 +1 @@
 unit ULastOpenedList;
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UListViewSort.pas

@@ -2 +2 @@
 
 // Date: 2019-05-17
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UMemory.pas

@@ -1 +1 @@
 unit UMemory;
-
-{$mode Delphi}{$H+}
 
 interface
@@ -43 +41 @@
     property Position: Integer read FPosition write FPosition;
   end;
+
 
 implementation

trunk/Packages/Common/UMetaCanvas.pas

@@ -1 +1 @@
 unit UMetaCanvas;
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UPersistentForm.pas

@@ -1 +1 @@
 unit UPersistentForm;
-
-{$mode delphi}
 
 // Date: 2020-11-26

trunk/Packages/Common/UPool.pas

@@ -1 +1 @@
 unit UPool;
-
-{$mode Delphi}{$H+}
 
 interface

trunk/Packages/Common/UPrefixMultiplier.pas

@@ -2 +2 @@
 
 // Date: 2010-06-01
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/URegistry.pas

@@ -1 +1 @@
 unit URegistry;
-
-{$MODE delphi}
 
 interface
@@ -132 +130 @@
 function TRegistryEx.OpenKey(const Key: string; CanCreate: Boolean): Boolean;
 begin
-  {$IFDEF Linux}
+  {$IFDEF UNIX}
   //CloseKey;
   {$ENDIF}

trunk/Packages/Common/UResetableThread.pas

@@ -1 +1 @@
 unit UResetableThread;
-
-{$mode Delphi}{$H+}
 
 interface

trunk/Packages/Common/UScaleDPI.pas

@@ -2 +2 @@
 
 { See: http://wiki.lazarus.freepascal.org/High_DPI }
-
-{$mode delphi}{$H+}
 
 interface
@@ -227 +225 @@
     Temp[I] := TBitmap.Create;
     Temp[I].SetSize(NewWidth, NewHeight);
-    {$IFDEF Linux}
+    {$IFDEF UNIX}
     Temp[I].PixelFormat := pf24bit;
     {$ELSE}

trunk/Packages/Common/USyncCounter.pas

@@ -1 +1 @@
 unit USyncCounter;
-
-{$mode delphi}
 
 interface
@@ -25 +23 @@
     procedure Assign(Source: TSyncCounter);
   end;
+
 
 implementation

trunk/Packages/Common/UThreading.pas

@@ -1 +1 @@
 unit UThreading;
-
-{$mode delphi}
 
 interface

trunk/Packages/Common/UTranslator.pas

@@ -1 +1 @@
 unit UTranslator;
-
-{$mode delphi}{$H+}
 
 interface

trunk/Packages/Common/UURI.pas

@@ -2 +2 @@
 
 // Date: 2011-04-04
-
-{$mode delphi}
 
 interface
@@ -84 +82 @@
     property AsString: string read GetAsString write SetAsString;
   end;
+
 
 implementation

trunk/Packages/Common/UXMLUtils.pas

@@ -1 +1 @@
 unit UXMLUtils;
-
-{$mode delphi}
 
 interface