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

replaced SetDirSeparators with SetPathDelims

Browse Source 
git-svn-id: trunk@42685 -
This commit is contained in:
mattias 2013-09-08 20:58:12 +00:00
parent 1fdae44bb9
commit ac4996ff62
19 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/aarre/src/aarrepkglist.pas
View File

@ -35,7 +35,7 @@ interface
uses
Classes, SysUtils, Laz2_XMLCfg, laz2_DOM, LazLogger, LazUTF8, LConvEncoding,
FileProcs, zstream;
LazFileUtils, FileProcs, zstream;
type
TAPackageType = (
@ -430,7 +430,7 @@ begin
NewPath:='';
p:=1;
while p<=length(Path) do begin
CurPath:=TrimFilename(SetDirSeparators(GetNextDelimitedItem(Path,';',p)));
CurPath:=TrimFilename(SetPathDelims(GetNextDelimitedItem(Path,';',p)));
if CurPath='' then continue;
MacroPos:=1;
while (MacroPos<length(CurPath)) do begin

5
components/codetools/basiccodetools.pas
View File

@ -40,7 +40,8 @@ unit BasicCodeTools;
interface
uses
Classes, SysUtils, AVL_Tree, SourceLog, KeywordFuncLists, FileProcs;
Classes, SysUtils, AVL_Tree, SourceLog, KeywordFuncLists, FileProcs,
LazFileUtils;
//----------------------------------------------------------------------------
{ These functions are used by the codetools }
@ -3686,7 +3687,7 @@ begin
EndPos:=StartPos;
while (EndPos<=MaxPos) and (ASource[EndPos]<>'}') do inc(EndPos);
if (EndPos=StartPos) or (EndPos>MaxPos) then exit;
Filename:=SetDirSeparators(copy(ASource,StartPos,EndPos-StartPos));
Filename:=SetPathDelims(copy(ASource,StartPos,EndPos-StartPos));
Result:=true;
end;

5
components/codetools/directorycacher.pas
View File

@ -35,7 +35,8 @@ unit DirectoryCacher;
interface
uses
Classes, SysUtils, LazUTF8, LazFileCache, FileProcs, AVL_Tree, CodeToolsStructs;
Classes, SysUtils, LazUTF8, LazFileCache, LazFileUtils, FileProcs, AVL_Tree,
CodeToolsStructs;
// verbosity
{ $DEFINE CTDEBUG}
@ -1191,7 +1192,7 @@ begin
{$ENDIF}
if InFilename<>'' then begin
// uses IN parameter
InFilename:=TrimFilename(SetDirSeparators(InFilename));
InFilename:=TrimFilename(SetPathDelims(InFilename));
if AnyCase then
UnitSrc:=ctdusInFilenameCaseInsensitive
else

4
components/codetools/stdcodetools.pas
View File

@ -53,7 +53,7 @@ uses
FindDeclarationTool, IdentCompletionTool, PascalReaderTool, PascalParserTool,
CodeBeautifier, ExprEval, KeywordFuncLists, BasicCodeTools, LinkScanner,
CodeCache, AVL_Tree, LFMTrees, SourceChanger,
CustomCodeTool, CodeToolsStructs;
CustomCodeTool, CodeToolsStructs, LazFileUtils;
type
TUsesSection = (usMain, usImplementation);
@ -6486,7 +6486,7 @@ var
OldFilename: String;
AFilename: String;
begin
OldFilename:=SetDirSeparators(copy(ASource,StartPos,EndPos-StartPos));
OldFilename:=SetPathDelims(copy(ASource,StartPos,EndPos-StartPos));
//DebugLn('FixFilename ',dbgs(StartPos),' ',dbgs(EndPos),' ',OldFilename);
AFilename:=OldFilename;
if ExtractFileExt(AFilename)='' then begin

4
components/externhelp/externhelpfrm.pas
View File

@ -614,7 +614,7 @@ procedure TExternHelpOptions.UpdateHelpDB;
SrcFilter: THelpDBISourceFile;
begin
if (Item.Filename<>'') and (Item.URL<>'') then begin
ItemFilename:=SetDirSeparators(Item.Filename);
ItemFilename:=SetPathDelims(Item.Filename);
// create a help node for this topic
HelpNode:=THelpNode.CreateURL(HelpDB,Item.Name,Item.URL);
// create a filter for the source file(s)
@ -1040,7 +1040,7 @@ begin
NameEdit.Enabled:=true;
NameEdit.Text:=Item.Name;
FilenameEdit.Enabled:=true;
ItemFilename:=SetDirSeparators(Item.Filename);
ItemFilename:=SetPathDelims(Item.Filename);
FilenameEdit.Text:=ItemFilename;
WithSubDirsCheckBox.Enabled:=Item.IsDirectory;
WithSubDirsCheckBox.Checked:=Item.WithSubDirectories;

8
components/h2pas/h2pasconvert.pas
View File

@ -24,10 +24,10 @@ interface
uses
Classes, SysUtils, LCLProc, LResources, LazConfigStorage, XMLPropStorage,
Forms, Controls, Dialogs, FileUtil, FileProcs, AVL_Tree,
Forms, Controls, Dialogs, FileUtil, LazFileUtils, AVL_Tree,
// CodeTools
CodeAtom, CodeTree, KeywordFuncLists, NonPascalCodeTools, BasicCodeTools,
CodeCache, SourceChanger, CodeToolManager,
FileProcs, CodeCache, SourceChanger, CodeToolManager,
// IDEIntf
TextTools, IDEExternToolIntf, IDEDialogs, LazIDEIntf, SrcEditorIntf,
IDEMsgIntf, IDETextConverter;
@ -1600,7 +1600,7 @@ end;
function TH2PasProject.NormalizeFilename(const AFilename: string): string;
begin
Result:=LongenFilename(SetDirSeparators(AFilename));
Result:=LongenFilename(SetPathDelims(AFilename));
end;
function TH2PasProject.HasEnabledFiles: boolean;
@ -1629,7 +1629,7 @@ var
i: Integer;
CurFile: TH2PasFile;
begin
AFilename:=SetDirSeparators(SrcFilename);
AFilename:=SetPathDelims(SrcFilename);
if System.Pos(PathDelim,AFilename)>0 then begin
// with sub path -> only search relative to AFile
Result:=TrimFilename(ExtractFilePath(aFile.Filename)+AFilename);

2
components/lazreport/samples/barcode/cbunit.pas
View File

@ -61,7 +61,7 @@ end;
procedure TForm1.FormCreate(Sender: TObject);
begin
OpenDialog1.InitialDir := ExtractFilePath(Application.ExeName)+'reports';
Dbf1.TableName := SetDirSeparators('..\editor\db\disco.dbf');
Dbf1.TableName := SetDirSeparators('../editor/db/disco.dbf');
Dbf1.Open;
end;

23
components/lazutils/lazfileutils.pas
View File

@ -591,7 +591,7 @@ end;
------------------------------------------------------------------------------}
function CleanAndExpandFilename(const Filename: string): string;
begin
Result:=ExpandFileNameUTF8(TrimFileName(SetDirSeparators(Filename)));
Result:=ExpandFileNameUTF8(TrimFileName(Filename));
end;
{------------------------------------------------------------------------------
@ -604,14 +604,14 @@ end;
function TrimAndExpandFilename(const Filename: string; const BaseDir: string): string;
begin
Result:=ChompPathDelim(TrimFilename(SetDirSeparators(Filename)));
Result:=ChompPathDelim(TrimFilename(Filename));
if Result='' then exit;
Result:=TrimFilename(ExpandFileNameUTF8(Result,BaseDir));
end;
function TrimAndExpandDirectory(const Filename: string; const BaseDir: string): string;
begin
Result:=TrimFilename(SetDirSeparators(Filename));
Result:=TrimFilename(Filename);
if Result='' then exit;
Result:=TrimFilename(AppendPathDelim(ExpandFileNameUTF8(Result,BaseDir)));
end;
@ -868,21 +868,6 @@ begin
end;
end;
function FileSearchUTF8(const Name, DirList: String; ImplicitCurrentDir : Boolean = True): String;
Var
I : longint;
@ -1011,7 +996,7 @@ begin
E.ErrorCode:=3;
Raise E;
end;
Result := DoForceDirectories(SetDirSeparators(Dir));
Result := DoForceDirectories(SetPathDelims(Dir));
end;

6
converter/convertdelphi.pas
View File

@ -34,7 +34,7 @@ interface
uses
// LCL+FCL
Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, LConvEncoding,
FileUtil, contnrs, IniFiles,
FileUtil, LazFileUtils, contnrs, IniFiles,
// codetools
CodeToolManager, DefineTemplates, CodeCache, LinkScanner, FileProcs, CodeToolsStructs,
// IDEIntf
@ -324,7 +324,7 @@ var
begin
Result:=Filename;
if Result='' then exit;
Result:=TrimFilename(SetDirSeparators(Result));
Result:=TrimFilename(SetPathDelims(Result));
// check for $(Delphi) macro
p:=System.Pos('$(DELPHI)',Result);
if p>0 then begin
@ -342,7 +342,7 @@ begin
Result:=ConvertDelphiAbsoluteToRelativeFile(Result, AProjPack);
end;
// change PathDelim
Result:=TrimFilename(SetDirSeparators(Result));
Result:=TrimFilename(SetPathDelims(Result));
end;
function ExpandDelphiSearchPath(const SearchPath: string;

4
examples/imagelist/unit1.pas
View File

@ -70,8 +70,8 @@ end;
procedure TForm1.FormCreate(Sender: TObject);
begin
AddFile(ExtractFilePath(ParamStrUTF8(0)) + SetDirSeparators('images\edit-clear.png'));
AddFile(ExtractFilePath(ParamStrUTF8(0)) + SetDirSeparators('images\edit-find-replace.png'));
AddFile(ExtractFilePath(ParamStrUTF8(0)) + SetDirSeparators('images/edit-clear.png'));
AddFile(ExtractFilePath(ParamStrUTF8(0)) + SetDirSeparators('images/edit-find-replace.png'));
end;
procedure TForm1.Button1Click(Sender: TObject);

10
ide/compileroptions.pp
View File

@ -42,9 +42,9 @@ unit CompilerOptions;
interface
uses
typinfo, Classes, SysUtils, FileProcs, FileUtil, Laz2_XMLCfg, InterfaceBase,
LCLProc, Forms, Controls, ExprEval, DefineTemplates, CodeToolsCfgScript,
CodeToolManager, KeywordFuncLists, BasicCodeTools,
typinfo, Classes, SysUtils, FileProcs, FileUtil, Laz2_XMLCfg, LazFileUtils,
InterfaceBase, LCLProc, Forms, Controls, ExprEval, DefineTemplates,
CodeToolsCfgScript, CodeToolManager, KeywordFuncLists, BasicCodeTools,
// IDEIntf
ProjectIntf, MacroIntf, IDEExternToolIntf, SrcEditorIntf, CompOptsIntf,
IDEOptionsIntf,
@ -3865,14 +3865,14 @@ begin
case Option of
pcosUnitPath,pcosIncludePath,pcosObjectPath,pcosLibraryPath,pcosSrcPath,
pcosDebugPath:
Result:=MergeSearchPaths(Result,SetDirSeparators(Vars[VarName]));
Result:=MergeSearchPaths(Result,SetPathDelims(Vars[VarName]));
pcosLinkerOptions:
Result:=MergeLinkerOptions(Result,Vars[VarName]);
pcosCustomOptions:
Result:=MergeCustomOptions(Result,Vars[VarName]);
pcosOutputDir,pcosCompilerPath:
if Vars.IsDefined(PChar(VarName)) then
Result:=SetDirSeparators(Vars[VarName]);
Result:=SetPathDelims(Vars[VarName]);
end
end;

4
ide/fpdoceditwindow.pas
View File

@ -1577,8 +1577,8 @@ begin
OpenDialog.Filter:=lisPascalFile+'|*.pas;*.pp;*.p|'+dlgAllFiles+'|'+FileMask;
OpenDialog.InitialDir:=ExtractFilePath(DocFile.Filename);
if OpenDialog.Execute then begin
ExampleEdit.Text := SetDirSeparators(ExtractRelativepath(
ExtractFilePath(DocFile.Filename), OpenDialog.FileName));
ExampleEdit.Text := ExtractRelativepath(
ExtractFilePath(DocFile.Filename), SetDirSeparators(OpenDialog.FileName));
if ExampleEdit.Text<>FOldVisualValues[fpdiExample] then
Modified:=true;
end;

14
ide/outputfilter.pas
View File

@ -27,7 +27,7 @@ interface
uses
Classes, Math, SysUtils, Forms, Controls, Dialogs, CompilerOptions,
AsyncProcess, LCLProc, DynQueue, FileUtil, UTF8Process,
AsyncProcess, LCLProc, DynQueue, FileUtil, UTF8Process, LazFileUtils,
CodeCache, CodeToolManager,
IDEDialogs, IDEMsgIntf, IDEExternToolIntf, IDEProcs, LazConf;
@ -1260,7 +1260,7 @@ begin
end;
// make filenames absolute if wanted
Filename:=TrimFilename(SetDirSeparators(copy(Msg,1,FilenameEndPos)));
Filename:=TrimFilename(SetPathDelims(copy(Msg,1,FilenameEndPos)));
if FilenameIsAbsolute(Filename) then begin
AbsFilename:=Filename;
CurrentMessageParts.Values['Filename']:=AbsFilename;
@ -1273,13 +1273,13 @@ begin
if (ofoMakeFilenamesAbsolute in Options) then begin
if (AbsFilename<>'') and (AbsFilename<>Filename) then begin
Filename:=AbsFilename;
Msg:=Filename+TrimFilename(SetDirSeparators(
Msg:=Filename+TrimFilename(SetPathDelims(
copy(Msg,FilenameEndPos+1,length(Msg)-FilenameEndPos)));
end;
end else begin
if FileIsInPath(Filename,fCurrentDirectory) then begin
Filename:=CreateRelativePath(Filename,fCurrentDirectory);
Msg:=Filename+TrimFilename(SetDirSeparators(
Msg:=Filename+TrimFilename(SetPathDelims(
copy(Msg,FilenameEndPos+1,length(Msg)-FilenameEndPos)));
end;
end;
@ -1507,7 +1507,7 @@ end;
procedure TOutputFilter.InternalSetCurrentDirectory(const Dir: string);
begin
fCurrentDirectory:=TrimFilename(AppendPathDelim(SetDirSeparators(Dir)));
fCurrentDirectory:=TrimFilename(AppendPathDelim(SetPathDelims(Dir)));
end;
procedure TOutputFilter.OnAsyncTerminate(Sender: TObject);
@ -1654,7 +1654,7 @@ begin
fMakeDirHistory.Add(fCurrentDirectory);
end;
// the make tool uses unix paths under windows
InternalSetCurrentDirectory(SetDirSeparators(copy(s,i,length(s)-i)));
InternalSetCurrentDirectory(SetPathDelims(copy(s,i,length(s)-i)));
exit;
end;
// check for leaving directory
@ -1678,7 +1678,7 @@ begin
MsgStartPos:=BracketEnd+1;
while (MsgStartPos<=length(s)) and (s[MsgStartPos]=' ') do inc(MsgStartPos);
MakeMsg:=copy(s,MsgStartPos,length(s)-MsgStartPos+1);
DoAddFilteredLine(SetDirSeparators(s));
DoAddFilteredLine(SetPathDelims(s));
if CompareText(copy(MakeMsg,1,5),'Error')=0 then
if (ofoExceptionOnError in Options) then
RaiseOutputFilterError(s);

2
ide/project.pp
View File

@ -5156,7 +5156,7 @@ end;
procedure TProject.AddSrcPath(const SrcPathAddition: string);
begin
CompilerOptions.SrcPath:=MergeSearchPaths(CompilerOptions.SrcPath,
SetDirSeparators(SrcPathAddition));
SetPathDelims(SrcPathAddition));
end;
function TProject.GetSourceDirs(WithProjectDir, WithoutOutputDir: boolean): string;

14
lcl/lazhelpintf.pas
View File

@ -26,7 +26,7 @@ interface
uses
Classes, SysUtils, LCLProc, FileUtil, LCLStrConsts, Dialogs,
LazConfigStorage, HelpIntfs, Masks;
LazConfigStorage, HelpIntfs, Masks, LazFileUtils;
type
{ THelpQueryItem }
@ -877,7 +877,7 @@ begin
StartPos:=EndPos;
while (EndPos<=length(ExpFilename)) and (ExpFilename[EndPos]<>';') do
inc(EndPos);
Dir:=TrimFilename(SetDirSeparators(copy(ExpFilename,StartPos,EndPos-StartPos)));
Dir:=TrimFilename(SetPathDelims(copy(ExpFilename,StartPos,EndPos-StartPos)));
if Dir<>'' then begin
if not FilenameIsAbsolute(Dir) then begin
if BaseDir='' then
@ -900,7 +900,7 @@ begin
if (HelpDatabases<>nil) then
HelpDatabases.SubstituteMacros(Result);
end;
Result:=TrimFilename(SetDirSeparators(Result));
Result:=TrimFilename(SetPathDelims(Result));
end;
{ THelpDatabase }
@ -2456,7 +2456,7 @@ constructor THelpDBISourceFile.Create(TheNode: THelpNode;
const TheFilename: string);
begin
inherited Create(TheNode);
FFilename:=TrimFilename(SetDirSeparators(TheFilename));
FFilename:=TrimFilename(SetPathDelims(TheFilename));
end;
function THelpDBISourceFile.FileMatches(const AFilename: string): boolean;
@ -2477,7 +2477,7 @@ begin
if (HelpDatabases<>nil) then
HelpDatabases.SubstituteMacros(ExpFilename);
//DebugLn(['THelpDBISourceFile.GetFullFilename substituted ',ExpFilename]);
ExpFilename:=TrimFilename(SetDirSeparators(ExpFilename));
ExpFilename:=TrimFilename(SetPathDelims(ExpFilename));
if FilenameIsAbsolute(ExpFilename) then
Result:=ExpFilename
else begin
@ -2491,7 +2491,7 @@ begin
if BasePathObject=nil then
Result:=''
else
Result:=AppendPathDelim(TrimFilename(SetDirSeparators(
Result:=AppendPathDelim(TrimFilename(SetPathDelims(
HelpDatabases.GetBaseDirectoryForBasePathObject(BasePathObject))));
end;
@ -2501,7 +2501,7 @@ constructor THelpDBISourceDirectory.Create(TheNode: THelpNode;
const Directory, TheFileMask: string; Recursive: boolean);
begin
inherited Create(TheNode,Directory);
FFileMask:=SetDirSeparators(TheFileMask);
FFileMask:=SetPathDelims(TheFileMask);
WithSubDirectories:=Recursive;
end;

2
packager/packagedefs.pas
View File

@ -1863,7 +1863,7 @@ procedure TPkgDependency.LoadFromXMLConfig(XMLConfig: TXMLConfig;
var
BaseDir: String;
begin
Result:=SetDirSeparators(XMLConfig.GetValue(Path+SubPath,''));
Result:=SetPathDelims(XMLConfig.GetValue(Path+SubPath,''));
if (Result<>'') and (Owner<>nil)
and (not FilenameIsAbsolute(Result)) then begin
BaseDir:=GetDependencyOwnerDirectory(Self);

6
packager/packagelinks.pas
View File

@ -40,8 +40,8 @@ interface
uses
Classes, SysUtils, Laz2_XMLCfg, FileProcs, CodeToolManager, CodeToolsStructs,
LCLProc, FileUtil, AvgLvlTree, lazutf8classes, MacroIntf, PackageIntf,
IDEProcs, EnvironmentOpts, PackageDefs, LazConf;
LCLProc, FileUtil, AvgLvlTree, lazutf8classes, LazFileUtils, MacroIntf,
PackageIntf, IDEProcs, EnvironmentOpts, PackageDefs, LazConf;
const
PkgLinksFileVersion = 2;
@ -491,7 +491,7 @@ begin
DebugLn('WARNING: pkg link file is empty: ',LPLFilename);
continue;
end;
LPKFilename:=SetDirSeparators(sl[0]);
LPKFilename:=SetPathDelims(sl[0]);
except
on E: Exception do begin
DebugLn('WARNING: unable to read pkg link file: ',LPLFilename,' : ',E.Message);

2
packager/packagesystem.pas
View File

@ -1541,7 +1541,7 @@ begin
Translated:=SystemLanguageID1;
// add unit paths
UsageOptions.UnitPath:=SetDirSeparators('$(PkgOutDir)');
UsageOptions.UnitPath:='$(PkgOutDir)';
// add requirements
AddRequiredDependency(LCLPackage.CreateDependencyWithOwner(Result));

4
packager/pkgmanager.pas
View File

@ -48,7 +48,7 @@ uses
contnrs, StringHashList, Translations, LResources,
// codetools
CodeToolsConfig, CodeToolManager, CodeCache, CodeToolsStructs, BasicCodeTools,
FileProcs, Laz2_XMLCfg, lazutf8classes,
FileProcs, Laz2_XMLCfg, lazutf8classes, LazFileUtils,
// IDE Interface
SrcEditorIntf, NewItemIntf, ProjectIntf, PackageIntf, CompOptsIntf,
MenuIntf, IDEWindowIntf, PropEdits, MacroIntf, LazIDEIntf,
@ -3747,7 +3747,7 @@ var
end;
end;
end;
UnitPath:=Trim(SetDirSeparators(APackage.UsageOptions.UnitPath));
UnitPath:=Trim(SetPathDelims(APackage.UsageOptions.UnitPath));
while (UnitPath<>'') and (UnitPath[1]=';') do
UnitPath:=copy(UnitPath,2,Length(UnitPath));
while (UnitPath<>'') and (RightStr(UnitPath,1)=';') do