paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 21:38:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Jedi code format: remove code that does nothing since OLD_REG_ROOT_KEY is equal to REG_ROOT_KEY

Browse Source
This commit is contained in:
DomingoGP 2024-01-06 12:38:19 +01:00
parent fb861fa2a1
commit 6fb4b3e49b
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/jcf2/ReadWrite/ConvertTypes.pas
View File

@ -58,8 +58,7 @@ type
TShowParseTreeOption = (eShowAlways, eShowOnError, eShowNever);
const
OLD_REG_ROOT_KEY = '\Software\Jedi\JediCodeFormat';
REG_ROOT_KEY = OLD_REG_ROOT_KEY;
REG_ROOT_KEY = '\Software\Jedi\JediCodeFormat';
const
SOURCE_FILE_FILTERS =

37
components/jcf2/Settings/JcfRegistrySettings.pas
View File

@ -237,45 +237,8 @@ begin
end;
constructor TJCFRegistrySettings.Create;
var
Registry: TRegistry;
begin
inherited;
// Move old registry content to new registry location if applicable
Registry := TRegistry.Create;
try
Registry.Access := KEY_ALL_ACCESS;
Registry.RootKey := HKEY_CURRENT_USER;
if not (Registry.OpenKey(REG_ROOT_KEY, False)) then
begin
if (Registry.OpenKey(OLD_REG_ROOT_KEY, False)) then
begin
Registry.MoveKey(OLD_REG_ROOT_KEY, REG_ROOT_KEY, True);
Registry.CloseKey;
if (Registry.OpenKey('\Software\Jedi', False)) then
begin
if not Registry.HasSubKeys then
begin
Registry.CloseKey;
if (Registry.OpenKey('\Software', False)) then
begin
Registry.DeleteKey('Jedi');
Registry.CloseKey;
end;
end
else
Registry.CloseKey;
end;
end;
end
else
Registry.CloseKey;
finally
Registry.Free;
end;
// New registry location
fcReg := TRegIniFile.Create(REG_ROOT_KEY);
fcExclusionsFiles := TStringList.Create; // Will compare with CompareText.