From 98de83d78ff7e56daee8bd6fae7e0e4b5251b213 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 20 Nov 2007 21:39:47 +0000 Subject: [PATCH] removed calls to obsolete lowercasetable git-svn-id: trunk@12939 - --- ide/ideprocs.pp | 32 -------------------------------- lcl/fileutil.pas | 4 ++++ lcl/include/fileutil.inc | 21 +++++++++++++-------- 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/ide/ideprocs.pp b/ide/ideprocs.pp index 39a1b4cd13..b210398090 100644 --- a/ide/ideprocs.pp +++ b/ide/ideprocs.pp @@ -219,7 +219,6 @@ procedure RaiseException(const Msg: string); procedure FreeThenNil(var Obj: TObject); function CompareCaret(const FirstCaret, SecondCaret: TPoint): integer; function CompareBoolean(b1, b2: boolean): integer; -function CompareStringPointerI(Data1, Data2: Pointer): integer; procedure CheckList(List: TList; TestListNil, TestDoubles, TestNils: boolean); procedure CheckList(List: TFPList; TestListNil, TestDoubles, TestNils: boolean); procedure CheckEmptyListCut(List1, List2: TList); @@ -1295,37 +1294,6 @@ begin Result:=-1; end; -function CompareStringPointerI(Data1, Data2: Pointer): integer; -var - S1: PChar; - S2: PChar; - c1: Integer; - c2: Integer; -begin - if (Data1=nil) then begin - if Data2=nil then begin - Result:=0; - end else begin - Result:=-1; - end; - end else begin - if Data2=nil then begin - Result:=1; - end else begin - S1:=PChar(Data1); - S2:=PChar(Data2); - repeat - c1:=Ord(S1[0]); - c2:=Ord(S2[0]); - Result:=Ord(LowerCaseTable[c1])-Ord(LowerCaseTable[c2]); //!! Must be replaced by ansi characters !! - if (Result<>0) or (c1=0) or (c2=0) then exit; - Inc(S1); - Inc(S2); - until false; - end; - end; -end; - procedure RemoveDoubles(List: TStrings); var i: Integer; diff --git a/lcl/fileutil.pas b/lcl/fileutil.pas index 185f142a77..60fcfa9b06 100644 --- a/lcl/fileutil.pas +++ b/lcl/fileutil.pas @@ -29,6 +29,10 @@ uses // For Smart Linking: Do not use the LCL! Classes, SysUtils, LCLStrConsts; +{$ifdef Windows} +{$define CaseInsensitiveFilenames} +{$endif} + const UTF8FileHeader = #$ef#$bb#$bf; diff --git a/lcl/include/fileutil.inc b/lcl/include/fileutil.inc index 5774dc1f08..7646e71946 100644 --- a/lcl/include/fileutil.inc +++ b/lcl/include/fileutil.inc @@ -39,7 +39,7 @@ end; ------------------------------------------------------------------------------} function CompareFilenames(const Filename1, Filename2: string): integer; begin - {$IFDEF WINDOWS} + {$IFDEF CaseInsensitiveFilenames} Result:=AnsiCompareText(Filename1, Filename2); {$ELSE} Result:=CompareStr(Filename1, Filename2); @@ -72,7 +72,9 @@ function CompareFilenames(Filename1: PChar; Len1: integer; var File1: string; File2: string; + {$IFNDEF CaseInsensitiveFilenames} i: Integer; + {$ENDIF} begin if (Len1=0) or (Len2=0) then begin Result:=Len1-Len2; @@ -83,22 +85,25 @@ begin Move(Filename1^,File1[1],Len1); SetLength(File2,Len2); Move(Filename2^,File2[1],Len2); - Result:=CompareFilenames(File1,File2); + Result:=CompareFilenames(File1,File2,true); end else begin + {$IFDEF CaseInsensitiveFilenames} + SetLength(File1,Len1); + Move(Filename1^,File1[1],Len1); + SetLength(File2,Len2); + Move(Filename2^,File2[1],Len2); + Result:=CompareFilenames(File1,File2); + {$ELSE} Result:=0; i:=0; while (Result=0) and ((i