Changeset 306 for trunk/Packages

Timestamp:

Sep 5, 2020, 8:10:03 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 2.0.10.

File:

• trunk/Packages/Common/URegistry.pas (modified) (8 diffs)

trunk/Packages/Common/URegistry.pas

@@ -1 +1 @@
 unit URegistry;
 
-{$MODE Delphi}
+{$MODE delphi}
 
 interface
@@ -17 +17 @@
     RootKey: HKEY;
     Key: string;
+    class function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; static; overload;
+    class function Create(RootKey: HKEY; Key: string): TRegistryContext; static; overload;
     class operator Equal(A, B: TRegistryContext): Boolean;
-    function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; overload;
-    function Create(RootKey: HKEY; Key: string): TRegistryContext; overload;
   end;
 
@@ -29 +29 @@
     procedure SetCurrentContext(AValue: TRegistryContext);
   public
+    function ReadChar(const Name: string): Char;
+    procedure WriteChar(const Name: string; Value: Char);
     function ReadBoolWithDefault(const Name: string;
       DefaultValue: Boolean): Boolean;
     function ReadIntegerWithDefault(const Name: string; DefaultValue: Integer): Integer;
     function ReadStringWithDefault(const Name: string; DefaultValue: string): string;
+    function ReadCharWithDefault(const Name: string; DefaultValue: Char): Char;
     function ReadFloatWithDefault(const Name: string;
       DefaultValue: Double): Double;
@@ -55 +58 @@
 end;
 
-function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
 begin
   Result.RootKey := RegistryRootHKEY[RootKey];
@@ -61 +64 @@
 end;
 
-function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
 begin
   Result.RootKey := RootKey;
@@ -85 +88 @@
     else begin
       WriteString(Name, DefaultValue);
+      Result := DefaultValue;
+    end;
+end;
+
+function TRegistryEx.ReadCharWithDefault(const Name: string; DefaultValue: Char
+  ): Char;
+begin
+  if ValueExists(Name) then Result := ReadChar(Name)
+    else begin
+      WriteChar(Name, DefaultValue);
       Result := DefaultValue;
     end;
@@ -120 +133 @@
 begin
   {$IFDEF Linux}
-  CloseKey;
+  //CloseKey;
   {$ENDIF}
   Result := inherited OpenKey(Key, CanCreate);
@@ -137 +150 @@
 end;
 
+function TRegistryEx.ReadChar(const Name: string): Char;
+var
+  S: string;
+begin
+  S := ReadString(Name);
+  if Length(S) > 0 then Result := S[1]
+    else Result := #0;
+end;
+
+procedure TRegistryEx.WriteChar(const Name: string; Value: Char);
+begin
+  WriteString(Name, Value);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;