mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-08 09:16:15 +02:00
lcl: formatting
git-svn-id: trunk@24707 -
This commit is contained in:
paul
parent
3def3ea76c
commit
a06ad84100
@ -135,8 +135,7 @@ type
|
||||
public
|
||||
constructor Create(TheDataSize: integer);
|
||||
function FindDescriptor(DescPtr: Pointer): TBlockResourceCacheDescriptor;
|
||||
function AddResource(Handle: TLCLHandle; DescPtr: Pointer
|
||||
): TBlockResourceCacheDescriptor;
|
||||
function AddResource(Handle: TLCLHandle; DescPtr: Pointer): TBlockResourceCacheDescriptor;
|
||||
function CompareDescriptors(Tree: TAvgLvlTree;
|
||||
Desc1, Desc2: Pointer): integer; override;
|
||||
public
|
||||
@ -169,8 +168,7 @@ end;
|
||||
|
||||
{ TResourceCacheItem }
|
||||
|
||||
constructor TResourceCacheItem.Create(TheCache: TResourceCache;
|
||||
TheHandle: TLCLHandle);
|
||||
constructor TResourceCacheItem.Create(TheCache: TResourceCache; TheHandle: TLCLHandle);
|
||||
begin
|
||||
Cache := TheCache;
|
||||
Handle := TheHandle;
|
||||
@ -180,7 +178,7 @@ destructor TResourceCacheItem.Destroy;
|
||||
begin
|
||||
if FDestroying then
|
||||
RaiseGDBException('');
|
||||
FDestroying:=true;
|
||||
FDestroying := True;
|
||||
Cache.RemoveItem(Self);
|
||||
//debugln('TResourceCacheItem.Destroy B ',dbgs(Self));
|
||||
Handle := 0;
|
||||
@ -214,8 +212,7 @@ begin
|
||||
//debugln('TResourceCacheItem.DecreaseRefCount END ');
|
||||
end;
|
||||
|
||||
procedure TResourceCacheItem.AddToList(var First, Last: TResourceCacheItem
|
||||
);
|
||||
procedure TResourceCacheItem.AddToList(var First, Last: TResourceCacheItem);
|
||||
// add as last
|
||||
begin
|
||||
Next := nil;
|
||||
@ -257,13 +254,12 @@ destructor TResourceCacheDescriptor.Destroy;
|
||||
begin
|
||||
if FDestroying then
|
||||
RaiseGDBException('');
|
||||
FDestroying:=true;
|
||||
FDestroying := True;
|
||||
Cache.RemoveDescriptor(Self);
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
procedure TResourceCacheDescriptor.AddToList(
|
||||
var First, Last: TResourceCacheDescriptor);
|
||||
procedure TResourceCacheDescriptor.AddToList(var First, Last: TResourceCacheDescriptor);
|
||||
// add as last
|
||||
begin
|
||||
Next := nil;
|
||||
@ -273,8 +269,7 @@ begin
|
||||
if Prev <> nil then Prev.Next := Self;
|
||||
end;
|
||||
|
||||
procedure TResourceCacheDescriptor.RemoveFromList(
|
||||
var First, Last: TResourceCacheDescriptor);
|
||||
procedure TResourceCacheDescriptor.RemoveFromList(var First, Last: TResourceCacheDescriptor);
|
||||
begin
|
||||
if First = Self then First := Next;
|
||||
if Last = Self then Last := Prev;
|
||||
@ -288,8 +283,10 @@ end;
|
||||
|
||||
procedure TResourceCache.RemoveItem(Item: TResourceCacheItem);
|
||||
begin
|
||||
if not FDestroying then begin
|
||||
while Item.FirstDescriptor<>nil do begin
|
||||
if not FDestroying then
|
||||
begin
|
||||
while Item.FirstDescriptor <> nil do
|
||||
begin
|
||||
if Item.FirstDescriptor.FDestroying then
|
||||
RaiseGDBException('TResourceCache.RemoveItem');
|
||||
Item.FirstDescriptor.Free;
|
||||
@ -302,13 +299,13 @@ procedure TResourceCache.RemoveDescriptor(Desc: TResourceCacheDescriptor);
|
||||
var
|
||||
Item: TResourceCacheItem;
|
||||
begin
|
||||
if not FDestroying then begin
|
||||
if not FDestroying then
|
||||
begin
|
||||
Item := Desc.Item;
|
||||
if Item <> nil then
|
||||
Desc.RemoveFromList(Item.FirstDescriptor, Item.LastDescriptor);
|
||||
FDescriptors.Remove(Desc);
|
||||
if (Item<>nil) and (Item.FirstDescriptor=nil) and (not Item.FDestroying)
|
||||
then
|
||||
if (Item <> nil) and (Item.FirstDescriptor = nil) and (not Item.FDestroying) then
|
||||
Item.Free;
|
||||
end;
|
||||
end;
|
||||
@ -316,7 +313,8 @@ end;
|
||||
procedure TResourceCache.ItemUsed(Item: TResourceCacheItem);
|
||||
// called after creation or when Item is used again
|
||||
begin
|
||||
if not ItemIsUsed(Item) then begin
|
||||
if not ItemIsUsed(Item) then
|
||||
begin
|
||||
// remove from unused list
|
||||
Item.RemoveFromList(FFirstUnusedItem, FLastUnusedItem);
|
||||
dec(FUnUsedItemCount);
|
||||
@ -338,7 +336,8 @@ begin
|
||||
Item.AddToList(FFirstUnusedItem, FLastUnusedItem);
|
||||
inc(FUnUsedItemCount);
|
||||
//debugln('TResourceCache.ItemUnused C ',ClassName,' ',dbgs(Self));
|
||||
if FUnUsedItemCount>FMaxUnusedItem then begin
|
||||
if FUnUsedItemCount > FMaxUnusedItem then
|
||||
begin
|
||||
// maximum unused resources reached -> free the oldest
|
||||
DeleteItem := FFirstUnusedItem;
|
||||
DeleteItem.RemoveFromList(FFirstUnusedItem, FLastUnusedItem);
|
||||
@ -349,8 +348,7 @@ end;
|
||||
|
||||
function TResourceCache.ItemIsUsed(Item: TResourceCacheItem): boolean;
|
||||
begin
|
||||
Result:=(FFirstUnusedItem<>Item) and (Item.Next=nil)
|
||||
and (Item.Prev=nil)
|
||||
Result := (FFirstUnusedItem <> Item) and (Item.Next = nil) and (Item.Prev = nil)
|
||||
end;
|
||||
|
||||
constructor TResourceCache.Create;
|
||||
@ -381,8 +379,7 @@ begin
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
function TResourceCache.CompareItems(Tree: TAvgLvlTree; Item1, Item2: Pointer
|
||||
): integer;
|
||||
function TResourceCache.CompareItems(Tree: TAvgLvlTree; Item1, Item2: Pointer): integer;
|
||||
begin
|
||||
Result := CompareLCLHandles(TResourceCacheItem(Item1).Handle,
|
||||
TResourceCacheItem(Item2).Handle);
|
||||
@ -402,7 +399,8 @@ begin
|
||||
if FItems.ConsistencyCheck <> 0 then
|
||||
RaiseGDBException('');
|
||||
ANode := FItems.FindLowest;
|
||||
while ANode<>nil do begin
|
||||
while ANode <> nil do
|
||||
begin
|
||||
Item := TResourceCacheItem(ANode.Data);
|
||||
if Item.FirstDescriptor = nil then
|
||||
RaiseGDBException('');
|
||||
@ -413,7 +411,8 @@ begin
|
||||
if Item.LastDescriptor.Next <> nil then
|
||||
RaiseGDBException('');
|
||||
Desc := Item.FirstDescriptor;
|
||||
while Desc<>nil do begin
|
||||
while Desc <> nil do
|
||||
begin
|
||||
if Desc.Item <> Item then
|
||||
RaiseGDBException('');
|
||||
if (Desc.Next <> nil) and (Desc.Next.Prev <> Desc) then
|
||||
@ -431,7 +430,8 @@ begin
|
||||
if FDescriptors.ConsistencyCheck <> 0 then
|
||||
RaiseGDBException('');
|
||||
ANode := FDescriptors.FindLowest;
|
||||
while ANode<>nil do begin
|
||||
while ANode <> nil do
|
||||
begin
|
||||
Desc := TResourceCacheDescriptor(ANode.Data);
|
||||
Item := Desc.Item;
|
||||
if Item = nil then
|
||||
@ -466,12 +466,10 @@ begin
|
||||
inherited Create;
|
||||
FDataSize := TheDataSize;
|
||||
FResourceCacheDescriptorClass := TBlockResourceCacheDescriptor;
|
||||
FOnCompareDescPtrWithDescriptor:=
|
||||
TListSortCompare(@CompareDescPtrWithBlockResDesc);
|
||||
FOnCompareDescPtrWithDescriptor := TListSortCompare(@CompareDescPtrWithBlockResDesc);
|
||||
end;
|
||||
|
||||
function TBlockResourceCache.FindDescriptor(DescPtr: Pointer
|
||||
): TBlockResourceCacheDescriptor;
|
||||
function TBlockResourceCache.FindDescriptor(DescPtr: Pointer): TBlockResourceCacheDescriptor;
|
||||
var
|
||||
ANode: TAvgLvlTreeNode;
|
||||
begin
|
||||
@ -482,8 +480,7 @@ begin
|
||||
Result := nil;
|
||||
end;
|
||||
|
||||
function TBlockResourceCache.AddResource(Handle: TLCLHandle; DescPtr: Pointer
|
||||
): TBlockResourceCacheDescriptor;
|
||||
function TBlockResourceCache.AddResource(Handle: TLCLHandle; DescPtr: Pointer): TBlockResourceCacheDescriptor;
|
||||
var
|
||||
Item: TResourceCacheItem;
|
||||
|
||||
@ -507,12 +504,12 @@ begin
|
||||
RaiseDescriptorAlreadyAdded;
|
||||
|
||||
Item := FindItem(Handle);
|
||||
if Item=nil then begin
|
||||
if Item = nil then
|
||||
begin
|
||||
Item := FResourceCacheItemClass.Create(Self, Handle);
|
||||
FItems.Add(Item);
|
||||
end;
|
||||
Result:=TBlockResourceCacheDescriptor(
|
||||
FResourceCacheDescriptorClass.Create(Self,Item));
|
||||
Result := TBlockResourceCacheDescriptor(FResourceCacheDescriptorClass.Create(Self, Item));
|
||||
ReAllocMem(Result.Data, DataSize);
|
||||
System.Move(DescPtr^, Result.Data^, DataSize);
|
||||
FDescriptors.Add(Result);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user