Changeset 65 for trunk/IDE/UCore.pas

Timestamp:

Jul 18, 2012, 10:57:48 PM (12 years ago)

Author:

chronos

Message:

• Modified: Updated GeneralRegistry package references.

File:

• trunk/IDE/UCore.pas (modified) (8 diffs)

trunk/IDE/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, ULastOpenedList, UProject, UApplicationInfo,
-  UCompiler, Registry, URegistry, UDebugLog, UCoolTranslator, UTarget;
+  UCompiler, UGeneralRegistry, UDebugLog, UCoolTranslator, UTarget;
 
 type
@@ -15 +15 @@
     SourceFiles: TSourceFileManager;
     TargetFiles: TSourceFileManager;
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure LoadFromRegistry(Root: Integer; Key: string);
+    procedure SaveToRegistry(Root: Integer; Key: string);
     constructor Create; override;
     destructor Destroy; override;
@@ -46 +46 @@
     procedure ProjectNew;
     procedure CompilerDebugLog(Text: string);
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure LoadFromRegistry(Root: Integer; Key: string);
+    procedure SaveToRegistry(Root: Integer; Key: string);
   end;
 
@@ -136 +136 @@
 end;
 
-procedure TCore.LoadFromRegistry(Root: HKEY; Key: string);
-begin
-  with TRegistryEx.Create do
-    try
-      RootKey := Root;
-      OpenKey(Key, True);
-      ReopenLastOpenedFile := ReadBoolWithDefault('ReopenLastOpenedFile', True);
-      Compiler.Target := Compiler.Targets.SearchBySysName(ReadStringWithDefault('TargetName', ''));
-      LogParsing := ReadBoolWithDefault('LogParsing', False);
+procedure TCore.LoadFromRegistry(Root: Integer; Key: string);
+begin
+  with TGeneralRegistry.Create(nil) do
+    try
+      CurrentRoot := Root;
+      OpenKey(Key, True);
+      if ValueExists('ReopenLastOpenedFile') then
+        ReopenLastOpenedFile := ReadBool('ReopenLastOpenedFile')
+        else ReopenLastOpenedFile := True;
+      if ValueExists('TargetName') then
+        Compiler.Target := Compiler.Targets.SearchBySysName(ReadString('TargetName'))
+        else Compiler.Target := nil;
+      if ValueExists('LogParsing') then
+        LogParsing := ReadBool('LogParsing')
+        else LogParsing := False;
       if ValueExists('LanguageCode') then
-        CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+        CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadString('LanguageCode'))
         else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
     finally
@@ -156 +162 @@
 end;
 
-procedure TCore.SaveToRegistry(Root: HKEY; Key: string);
-begin
-  with TRegistryEx.Create do
-    try
-      RootKey := Root;
+procedure TCore.SaveToRegistry(Root: Integer; Key: string);
+begin
+  with TGeneralRegistry.Create(nil) do
+    try
+      CurrentRoot := Root;
       OpenKey(Key, True);
       WriteBool('ReopenLastOpenedFile', ReopenLastOpenedFile);
       if Assigned(Compiler.Target) then
         WriteString('TargetName', Compiler.Target.SysName)
-        else DeleteValue('TargetName');
+        else WriteString('TargetName', '');
       WriteBool('LogParsing', LogParsing);
       if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
         WriteString('LanguageCode', CoolTranslator1.Language.Code)
-        else DeleteValue('LanguageCode');
+        else WriteString('LanguageCode', '');
     finally
       Free;
@@ -180 +186 @@
 { TCustomCompiler }
 
-procedure TCustomCompiler.LoadFromRegistry(Root: HKEY; Key: string);
+procedure TCustomCompiler.LoadFromRegistry(Root: Integer; Key: string);
 var
   I: Integer;
 begin
-  with TRegistryEx.Create do
-    try
-      RootKey := Root;
+  with TGeneralRegistry.Create(nil) do
+    try
+      CurrentRoot := Root;
       for I := 0 to Targets.Count - 1 do
       with TTarget(Targets[I]) do begin
         OpenKey(Key + '\Targets\' + Name, True);
         if ValueExists('CompilerPath') then
-          Producer.CompilerPath := ReadStringWithDefault('CompilerPath', Producer.CompilerPath);
+          Producer.CompilerPath := ReadString('CompilerPath');
       end;
+      OpenKey(Key, True);
       if ValueExists('SelectedTarget') then
-      Target := Targets.SearchBySysName(ReadString('SelectedTarget'))
+        Target := Targets.SearchBySysName(ReadString('SelectedTarget'))
         else Target := nil;
     finally
@@ -201 +208 @@
 end;
 
-procedure TCustomCompiler.SaveToRegistry(Root: HKEY; Key: string);
+procedure TCustomCompiler.SaveToRegistry(Root: Integer; Key: string);
 var
   I: Integer;
 begin
-  with TRegistryEx.Create do
-    try
-      RootKey := Root;
+  with TGeneralRegistry.Create(nil) do
+    try
+      CurrentRoot := Root;
       for I := 0 to Targets.Count - 1 do
       with TTarget(Targets[I]) do begin
@@ -213 +220 @@
         if Assigned(Producer) then begin
           if Producer.CompilerPath <> '' then WriteString('CompilerPath', Producer.CompilerPath)
-            else DeleteValue('CompilerPath');
+            else WriteString('CompilerPath', '');
         end;
       end;
+      OpenKey(Key, True);
       if Assigned(Target) then WriteString('SelectedTarget', Target.SysName)
-        else DeleteValue('SelectedTarget');
+        else WriteString('SelectedTarget', '');
     finally
       Free;