From 9cab951c1872c8e3394a9f0a4b7d8f27f1d609ad Mon Sep 17 00:00:00 2001 From: bart <9132501-flyingsheep@users.noreply.gitlab.com> Date: Thu, 6 Jun 2013 21:22:21 +0000 Subject: [PATCH] LazUtils: Move FileIsReadOnly to LazFileUtils (and inline it in FileUtil). Part of the ongoing restructuring of LazFileUtils/FileUtil. git-svn-id: trunk@41566 - --- components/lazutils/fileutil.inc | 2 +- components/lazutils/fileutil.pas | 2 +- components/lazutils/lazfileutils.pas | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/lazutils/fileutil.inc b/components/lazutils/fileutil.inc index 1c2b77dc17..3f1109d8d6 100644 --- a/components/lazutils/fileutil.inc +++ b/components/lazutils/fileutil.inc @@ -1279,7 +1279,7 @@ end; ------------------------------------------------------------------------------} function FileIsReadOnlyUTF8(const FileName: String): Boolean; begin - Result:=FileGetAttrUTF8(FileName) and faReadOnly > 0; + Result := LazFileUtils.FileIsReadOnlyUTF8(FileName); end; diff --git a/components/lazutils/fileutil.pas b/components/lazutils/fileutil.pas index e34716b611..244d6319e7 100644 --- a/components/lazutils/fileutil.pas +++ b/components/lazutils/fileutil.pas @@ -250,7 +250,7 @@ function FileSetAttrUTF8(const Filename: String; Attr: longint): Longint; inline function DeleteFileUTF8(const FileName: String): Boolean; inline; function RenameFileUTF8(const OldName, NewName: String): Boolean; inline; function FileSearchUTF8(const Name, DirList : String; ImplicitCurrentDir : Boolean = True): String; -function FileIsReadOnlyUTF8(const FileName: String): Boolean; +function FileIsReadOnlyUTF8(const FileName: String): Boolean; inline; function GetCurrentDirUTF8: String; inline; function SetCurrentDirUTF8(const NewDir: String): Boolean; inline; function CreateDirUTF8(const NewDir: String): Boolean; inline; diff --git a/components/lazutils/lazfileutils.pas b/components/lazutils/lazfileutils.pas index 43409bc7db..5ed8daf139 100644 --- a/components/lazutils/lazfileutils.pas +++ b/components/lazutils/lazfileutils.pas @@ -852,7 +852,7 @@ end; function FileIsReadOnlyUTF8(const FileName: String): Boolean; begin - Result:=SysUtils.FileIsReadOnly(UTF8ToSys(Filename)); + Result:=FileGetAttrUTF8(FileName) and faReadOnly > 0; end;