mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Warnings

Browse source 
(cherry picked from commit 6e413a96dc)
This commit is contained in:
Alexander Koblov 2024-04-06 13:34:03 +03:00
commit bf406ee4cb
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/doublecmd/dcunicodeutils.pas
View file

@ -480,7 +480,7 @@ begin
Index:= 0;
SrcPos:= PAnsiChar(UTF8Text);
while Len > 0 do begin
Result[Index]:= UTF8CharacterToUnicode(SrcPos, CharLen);
Result[Index]:= UTF8CodepointToUnicode(SrcPos, CharLen);
Inc(SrcPos, CharLen);
Dec(Len, CharLen);
Inc(Index);

4
components/viewer/viewercontrol.pas
View file

@ -3009,7 +3009,7 @@ begin
Result := PByte(GetDataAdr)[iPosition];
// Full conversion:
// Result := UTF8CharacterToUnicode(PAnsiChar(GetDataAdr + iPosition), CharLenInBytes);
// Result := UTF8CodepointToUnicode(PAnsiChar(GetDataAdr + iPosition), CharLenInBytes);
end
else
CharLenInBytes := 0;
@ -3133,7 +3133,7 @@ begin
Result := PByte(GetDataAdr)[iPosition - 1];
// Full conversion:
// Result := UTF8CharacterToUnicode(PAnsiChar(GetDataAdr + iPosition - CharLenInBytes), CharLenInBytes);
// Result := UTF8CodepointToUnicode(PAnsiChar(GetDataAdr + iPosition - CharLenInBytes), CharLenInBytes);
end
else
CharLenInBytes := 0;

2
plugins/wcx/zip/src/fparchive/abziptyp.pas
View file

@ -1520,7 +1520,7 @@ begin
FItemInfo.LoadFromStream( Stream );
{ decode filename (ANSI/OEM/UTF-8) }
if FItemInfo.IsUTF8 and (FindInvalidUTF8Character(PAnsiChar(FItemInfo.FileName), Length(FItemInfo.FileName)) < 0) then
if FItemInfo.IsUTF8 and (FindInvalidUTF8Codepoint(PAnsiChar(FItemInfo.FileName), Length(FItemInfo.FileName)) < 0) then
FFileName := FItemInfo.FileName
else if FItemInfo.ExtraField.Get(Ab_InfoZipUnicodePathSubfieldID, Pointer(InfoZipField), FieldSize) and
(FieldSize > SizeOf(TInfoZipUnicodePathRec)) and

2
src/filesources/filesystem/ufilesystemcalcchecksumoperation.pas
View file

@ -402,7 +402,7 @@ begin
{$ENDIF}
if StrBegins(AText, UTF8BOM) then
FCheckSumFile.Text:= Copy(AText, 4, MaxInt)
else if FindInvalidUTF8Character(PChar(AText), Length(AText), True) = -1 then
else if FindInvalidUTF8Codepoint(PChar(AText), Length(AText), True) = -1 then
FCheckSumFile.Text:= AText
else begin
FCheckSumFile.Text:= CeAnsiToUtf8(AText);

4
src/fpsnumformat.pas
View file

@ -3719,7 +3719,7 @@ begin
'_': // Excel: Leave width of next character empty
begin
FToken := NextToken;
uch := UTF8CharacterToUnicode(FCurrent, n); // wp: Why Unicode ???
uch := UTF8CodepointToUnicode(FCurrent, n); // wp: Why Unicode ???
if n > 1 then
begin
AddElement(nftEmptyCharWidth, UnicodeToUTF8(uch));
@ -3760,7 +3760,7 @@ begin
Exit;
end;
else
uch := UTF8CharacterToUnicode(FCurrent, n);
uch := UTF8CodepointToUnicode(FCurrent, n);
if n > 1 then
begin
AddElement(nftText, UnicodeToUTF8(uch));

4
src/fviewer.pas
View file

@ -1997,7 +1997,7 @@ procedure TfrmViewer.TimerViewerTimer(Sender: TObject);
begin
if (miFullScreen.Checked) then
begin
if (ToolBar1.Visible) and (i_timer > 60) and (not ToolBar1.MouseEntered) then
if (ToolBar1.Visible) and (i_timer > 60) and (not ToolBar1.MouseInClient) then
begin
ToolBar1.Visible:= False;
AdjustImageSize;
@ -2011,7 +2011,7 @@ begin
Inc(i_timer);
if (btnSlideShow.Down) and (i_timer = 60 * btnSlideShow.Tag) then
begin
if (ToolBar1.Visible) and (not ToolBar1.MouseEntered) then
if (ToolBar1.Visible) and (not ToolBar1.MouseInClient) then
begin
ToolBar1.Visible:= False;
AdjustImageSize;

2
src/uexceptions.pas
View file

@ -137,7 +137,7 @@ begin
else
Msg := ExceptionText;
if FindInvalidUTF8Character(PChar(Msg), Length(Msg), False) > 0 then
if FindInvalidUTF8Codepoint(PChar(Msg), Length(Msg), False) > 0 then
Msg := CeSysToUtf8(Msg);
if (Msg <> '') and (Msg[length(Msg)] = LineEnding) then Delete(Msg, Length(Msg), 1);

2
src/upathlabel.pas
View file

@ -240,7 +240,7 @@ end;
procedure TPathLabel.TextChanged;
begin
inherited TextChanged;
if FAllowHighlight and MouseEntered then Highlight;
if FAllowHighlight and MouseInClient then Highlight;
end;
procedure TPathLabel.MouseEnter;