paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 19:29:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Cleanup (TBetterRegistry removed) Issue #0022509 Patch by Zaher Dirkey

Browse Source 
git-svn-id: trunk@38848 -
This commit is contained in:
martin 2012-09-26 11:37:44 +00:00
parent 4eb36e3724
commit 1591be495b
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/synedit/synedithighlighter.pp
View File

@ -36,17 +36,7 @@ uses
Graphics, FileUtil, LCLProc, LCLIntf, LCLType, Registry, IniFiles,
SynEditTypes, SynEditTextBase;
{$DEFINE _Gp_MustEnhanceRegistry}
{$IFDEF SYN_COMPILER_4_UP}
{$UNDEF _Gp_MustEnhanceRegistry}
{$ENDIF}
type
TBetterRegistry = class(TRegistry)
{$IFDEF _Gp_MustEnhanceRegistry}
function OpenKeyReadOnly(const Key: string): Boolean;
{$ENDIF}
end;
{ TSynHighlighterRangeList }
TSynHighlighterRangeList = class(TSynManagedStorageMem)
@ -176,8 +166,8 @@ type
procedure InternalSaveDefaultValues;
function LoadFromBorlandRegistry(rootKey: HKEY; attrKey, attrName: string;
oldStyle: boolean): boolean; virtual;
function LoadFromRegistry(Reg: TBetterRegistry): boolean;
function SaveToRegistry(Reg: TBetterRegistry): boolean;
function LoadFromRegistry(Reg: TRegistry): boolean;
function SaveToRegistry(Reg: TRegistry): boolean;
function LoadFromFile(Ini : TIniFile): boolean;
function SaveToFile(Ini : TIniFile): boolean;
public
@ -831,7 +821,7 @@ const
fgIndex16: string;
bgIndex16: string;
{$ENDIF}
reg : TBetterRegistry;
reg : TRegistry;
function Get(var name: string): string;
var
@ -846,7 +836,7 @@ const
begin { LoadOldStyle }
Result := false;
try
reg := TBetterRegistry.Create;
reg := TRegistry.Create;
reg.RootKey := rootKey;
try
with reg do begin
@ -894,7 +884,7 @@ const
fgDefault : string;
bgDefault : string;
{$ENDIF}
reg : TBetterRegistry;
reg : TRegistry;
function IsTrue(value: string): boolean;
begin
@ -904,7 +894,7 @@ const
begin
Result := false;
try
reg := TBetterRegistry.Create;
reg := TRegistry.Create;
reg.RootKey := rootKey;
try
with reg do begin
@ -957,7 +947,7 @@ begin
else Result := LoadNewStyle(rootKey, attrKey, attrName);
end; { TSynHighlighterAttributes.LoadFromBorlandRegistry }
function TSynHighlighterAttributes.LoadFromRegistry(Reg: TBetterRegistry): boolean;
function TSynHighlighterAttributes.LoadFromRegistry(Reg: TRegistry): boolean;
{$IFNDEF SYN_LAZARUS}
var
key: string;
@ -984,7 +974,7 @@ begin
{$ENDIF}
end;
function TSynHighlighterAttributes.SaveToRegistry(Reg: TBetterRegistry): boolean;
function TSynHighlighterAttributes.SaveToRegistry(Reg: TRegistry): boolean;
var
key: string;
begin
@ -1190,12 +1180,12 @@ end;
function TSynCustomHighlighter.LoadFromRegistry(RootKey: HKEY;
Key: string): boolean;
var
r: TBetterRegistry;
r: TRegistry;
{$IFNDEF FPC}
i: integer;
{$ENDIF}
begin
r := TBetterRegistry.Create;
r := TRegistry.Create;
try
r.RootKey := RootKey;
{$IFNDEF FPC}
@ -1214,10 +1204,10 @@ end;
function TSynCustomHighlighter.SaveToRegistry(RootKey: HKEY;
Key: string): boolean;
var
r: TBetterRegistry;
r: TRegistry;
i: integer;
begin
r := TBetterRegistry.Create;
r := TRegistry.Create;
try
r.RootKey := RootKey;
if r.OpenKey(Key,true) then begin

8
components/synedit/synhighlighterany.pas
View File

@ -895,9 +895,9 @@ end;
function TSynAnySyn.LoadFromRegistry(RootKey: HKEY; Key: string): boolean;
var
r: TBetterRegistry;
r: TRegistry;
begin
r:= TBetterRegistry.Create;
r:= TRegistry.Create;
try
r.RootKey := RootKey;
if r.OpenKeyReadOnly(Key) then begin
@ -910,9 +910,9 @@ end;
function TSynAnySyn.SaveToRegistry(RootKey: HKEY; Key: string): boolean;
var
r: TBetterRegistry;
r: TRegistry;
begin
r:= TBetterRegistry.Create;
r:= TRegistry.Create;
try
r.RootKey := RootKey;
if r.OpenKey(Key,true) then begin

2
components/synedit/synhighlightercpp.pp
View File

@ -1528,7 +1528,7 @@ end;
procedure TSynCppSyn.EnumUserSettings(settings: TStrings);
begin
{ returns the user settings that exist in the registry }
with TBetterRegistry.Create do
with TRegistry.Create do
begin
try
RootKey := HKEY_LOCAL_MACHINE;

2
components/synedit/synhighlighterpas.pp
View File

@ -3092,7 +3092,7 @@ end;
procedure TSynPasSyn.EnumUserSettings(settings: TStrings);
begin
{ returns the user settings that exist in the registry }
with TBetterRegistry.Create do
with TRegistry.Create do
begin
try
RootKey := HKEY_LOCAL_MACHINE;