paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-02 19:24:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

pochecker: unicode file names

Browse Source 
git-svn-id: trunk@46820 -
This commit is contained in:
mattias 2014-11-12 19:16:26 +00:00
parent 43888531e1
commit 5ff4472038
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/pochecker/simplepofiles.pp
View File

@ -48,7 +48,7 @@ implementation
{$ELSE}
uses
Classes, SysUtils, LCLProc, FileUtil, StringHashList
Classes, SysUtils, LCLProc, FileUtil, StringHashList, LazUTF8Classes
{, LConvEncoding}
//{$IFDEF UNIX}{$IFNDEF DisableCWString}, cwstring{$ENDIF}{$ENDIF}
;
@ -169,9 +169,9 @@ end;
function UTF8ToSystemCharSet(const s: string): string; inline;
begin
{$IFDEF NoUTF8Translations}
if SystemCharSetIsUTF8 then
exit(s);
{$IFDEF NoUTF8Translations}
Result:=s;
{$ELSE}
Result:=UTF8ToSys(s);
@ -271,7 +271,7 @@ begin
end;
InputLines := TStringList.Create;
InputLines := TStringListUTF8.Create;
try
// Read base po items
if FileExistsUTF8(POFilename) then
@ -289,7 +289,7 @@ begin
//DebugLn('');
//DebugLn(['AddFiles2Po Filename="',Filename,'"']);
InputLines.Clear;
InputLines.LoadFromFile(UTF8ToSys(FileName));
InputLines.LoadFromFile(FileName);
if CompareFileExt(Filename,'.lrt')=0 then
BasePOFile.UpdateStrings(InputLines, stLrt)
@ -391,7 +391,7 @@ constructor TSimplePOFile.Create(const AFilename: String; const Full: Boolean =
var
f: TStream;
begin
f := TFileStream.Create(UTF8ToSys(AFilename), fmOpenRead or fmShareDenyNone);
f := TFileStreamUTF8.Create(AFilename, fmOpenRead or fmShareDenyNone);
try
Create(f, Full);
if FHeader=nil then CreateHeader;
@ -1020,7 +1020,7 @@ end;
{
procedure TSimplePOFile.SaveToFile(const AFilename: string);
var
OutLst: TStringList;
OutLst: TStringListUTF8;
j: Integer;
procedure WriteLst(const AProp, AValue: string );
@ -1084,7 +1084,7 @@ begin
for j:=0 to Fitems.Count-1 do
WriteItem(TPOFileItem(FItems[j]));
OutLst.SaveToFile(UTF8ToSys(AFilename));
OutLst.SaveToFile(AFilename);
finally
OutLst.Free;

6
components/synedit/synhighlighterlfm.pas
View File

@ -49,7 +49,7 @@ unit SynHighlighterLFM;
interface
uses
SysUtils, Classes, FileUtil, Graphics,
SysUtils, Classes, FileUtil, LazUTF8Classes, Graphics,
SynEditTypes, SynEditHighlighter, SynEditHighlighterFoldBase;
type
@ -181,7 +181,7 @@ begin
WasText := FALSE;
AStrings.Clear;
try
Src := TFileStream.Create(UTF8ToSys(AFile), fmOpenRead or fmShareDenyWrite);
Src := TFileStreamUTF8.Create(AFile, fmOpenRead or fmShareDenyWrite);
try
Dest := TMemoryStream.Create;
try
@ -210,7 +210,7 @@ begin
try
AStrings.SaveToStream(Src);
Src.Seek(0, soFromBeginning);
Dest := TFileStream.Create(UTF8ToSys(AFile), fmCreate);
Dest := TFileStreamUTF8.Create(AFile, fmCreate);
try
ObjectTextToResource(Src, Dest);
finally

6
components/synedit/synmacrorecorder.pas
View File

@ -41,7 +41,7 @@ unit SynMacroRecorder;
interface
uses
Classes, SysUtils, FileUtil, Types, LCLType, Menus,
Classes, SysUtils, FileUtil, LazUTF8Classes, Types, LCLType, Menus,
SynEdit, SynEditKeyCmds, SynEditPlugins;
resourcestring
@ -939,7 +939,7 @@ procedure TCustomSynMacroRecorder.LoadFromFile(aFilename: string);
var
F : TFileStream;
begin
F := TFileStream.Create(UTF8ToSys(aFilename), fmOpenRead);
F := TFileStreamUTF8.Create(aFilename, fmOpenRead);
try
LoadFromStream(F);
MacroName := ChangeFileExt(ExtractFileName(aFilename), '');
@ -952,7 +952,7 @@ procedure TCustomSynMacroRecorder.SaveToFile(aFilename: string);
var
F : TFileStream;
begin
F := TFileStream.Create(UTF8ToSys(aFilename), fmCreate);
F := TFileStreamUTF8.Create(aFilename, fmCreate);
try
SaveToStream(F);
finally