From 3a9e8d9e0cba27c664dad4286f67db245b73fbbc Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 28 May 2013 08:09:50 +0000 Subject: [PATCH] lazutils: clean up git-svn-id: trunk@41439 - --- components/lazutils/fileutil.pas | 4 ++-- components/lazutils/winfileutil.inc | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/components/lazutils/fileutil.pas b/components/lazutils/fileutil.pas index 09801a729d..1fe0aba4b5 100644 --- a/components/lazutils/fileutil.pas +++ b/components/lazutils/fileutil.pas @@ -37,7 +37,7 @@ ToDo: - Any other functions/procedures that are needed in LazFileUtils too, should be moved to LazFileUtils, and in Fileutil inlined to use LazileUtils counterparts -PLEASE DO NOT ADD MORE UTF8 RELATED (FILE) ROUTINES TO THIS UNIT ! +DO NOT ADD MORE UTF8 RELATED (FILE) ROUTINES TO THIS UNIT ! ***************************************************************************** } unit FileUtil; @@ -47,7 +47,7 @@ unit FileUtil; interface uses - SysConst, Classes, SysUtils, Masks, LazUtilsStrConsts, lazutf8, LazFileUtils; + Classes, SysUtils, Masks, LazUtilsStrConsts, LazUTF8, LazFileUtils; {$if defined(Windows) or defined(darwin)} {$define CaseInsensitiveFilenames} diff --git a/components/lazutils/winfileutil.inc b/components/lazutils/winfileutil.inc index 9064d10333..88bc641e0a 100644 --- a/components/lazutils/winfileutil.inc +++ b/components/lazutils/winfileutil.inc @@ -1,7 +1,5 @@ {%MainUnit fileutil.pas} - - {------------------------------------------------------------------------------ GetFileDescription ------------------------------------------------------------------------------} @@ -27,8 +25,6 @@ begin Result:=Filename; end; - - function ConsoleToUTF8(const s: string): string;// converts UTF8 string to console encoding (used by Write, WriteLn) var Dst: PChar;