Skip to content

Commit 3b763c5

Browse files
authored
Merge pull request #17 from LongDirtyAnimAlf/lazarus-v5
Fix FPC trunk compilation
2 parents ed5877e + 4abcc9a commit 3b763c5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Source/VirtualTrees.pas

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5778,7 +5778,7 @@ procedure TBufferedUTF8String.Add(const S: String);
57785778
FPosition := FStart + LastOffset;
57795779
FEnd := FStart + NewLen;
57805780
end;
5781-
Move(PChar(S)^, FPosition^, Len);
5781+
System.Move(PChar(S)^, FPosition^, Len);
57825782
Inc(FPosition, Len);
57835783
end;
57845784

@@ -8240,12 +8240,12 @@ procedure TVirtualTreeColumns.AdjustPosition(Column: TVirtualTreeColumn; Positio
82408240
if OldPosition < Position then
82418241
begin
82428242
// column will be moved up so move down other entries
8243-
Move(FPositionToIndex[OldPosition + 1], FPositionToIndex[OldPosition], (Position - OldPosition) * SizeOf(Cardinal));
8243+
System.Move(FPositionToIndex[OldPosition + 1], FPositionToIndex[OldPosition], (Position - OldPosition) * SizeOf(Cardinal));
82448244
end
82458245
else
82468246
begin
82478247
// column will be moved down so move up other entries
8248-
Move(FPositionToIndex[Position], FPositionToIndex[Position + 1], (OldPosition - Position) * SizeOf(Cardinal));
8248+
System.Move(FPositionToIndex[Position], FPositionToIndex[Position + 1], (OldPosition - Position) * SizeOf(Cardinal));
82498249
end;
82508250
FPositionToIndex[Position] := Column.Index;
82518251
end;
@@ -8490,7 +8490,7 @@ procedure TVirtualTreeColumns.IndexChanged(OldIndex, NewIndex: Integer);
84908490
begin
84918491
// Index found. Move all higher entries one step down and remove the last entry.
84928492
if I < Upper then
8493-
Move(FPositionToIndex[I + 1], FPositionToIndex[I], (Upper - I) * SizeOf(TColumnIndex));
8493+
System.Move(FPositionToIndex[I + 1], FPositionToIndex[I], (Upper - I) * SizeOf(TColumnIndex));
84948494
end;
84958495
// Decrease all indices, which are greater than the index to be deleted.
84968496
if FPositionToIndex[I] > OldIndex then
@@ -23298,7 +23298,7 @@ function TBaseVirtualTree.InternalAddToSelection(const NewItems: TNodeArray; New
2329823298
else
2329923299
begin
2330023300
// insert remaining new entries at position 0
23301-
Move(NewItems[0], FSelection[0], (J + 1) * SizeOf(Pointer));
23301+
System.Move(NewItems[0], FSelection[0], (J + 1) * SizeOf(Pointer));
2330223302
// nothing more to do so exit main loop
2330323303
Break;
2330423304
end;
@@ -23309,7 +23309,7 @@ function TBaseVirtualTree.InternalAddToSelection(const NewItems: TNodeArray; New
2330923309
Dec(I);
2331023310
// move all entries which are greater than the greatest entry in the new items list up
2331123311
// so the remaining gap travels down to where new items must be inserted
23312-
Move(FSelection[I + 1], FSelection[I + J + 2], (CurrentEnd - I) * SizeOf(Pointer));
23312+
System.Move(FSelection[I + 1], FSelection[I + J + 2], (CurrentEnd - I) * SizeOf(Pointer));
2331323313
CurrentEnd := I;
2331423314
end;
2331523315

@@ -25008,7 +25008,7 @@ procedure TBaseVirtualTree.RemoveFromSelection(Node: PVirtualNode);
2500825008
begin
2500925009
Exclude(Node.States, vsSelected);
2501025010
if FindNodeInSelection(Node, Index, -1, -1) and (Index < FSelectionCount - 1) then
25011-
Move(FSelection[Index + 1], FSelection[Index], (FSelectionCount - Index - 1) * SizeOf(Pointer));
25011+
System.Move(FSelection[Index + 1], FSelection[Index], (FSelectionCount - Index - 1) * SizeOf(Pointer));
2501225012
if FSelectionCount > 0 then
2501325013
Dec(FSelectionCount);
2501425014
SetLength(FSelection, FSelectionCount);

0 commit comments

Comments
 (0)