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

IDE: use AppendPathDelim instead of IncludeTrailingPathDelimiter for config paths.

Browse Source 
git-svn-id: trunk@51404 -
This commit is contained in:
ondrej 2016-01-25 12:47:53 +00:00
parent 3b96e24301
commit 01a9fd311b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/ideprotocol.pas
View File

@ -32,7 +32,8 @@ unit IDEProtocol;
interface interface
uses uses
Classes, SysUtils, LCLProc, LazConf, BaseIDEIntf, LazConfigStorage; Classes, SysUtils, LCLProc, LazConf, BaseIDEIntf, LazConfigStorage,
LazFileUtils;
const const
IDEProtocolOptsVersion: integer = 1; IDEProtocolOptsVersion: integer = 1;
@ -80,7 +81,7 @@ var
Config: TConfigStorage; Config: TConfigStorage;
begin begin
if Filename='' then if Filename='' then
Filename:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+IDEProtocolFilename; Filename:=AppendPathDelim(GetPrimaryConfigPath)+IDEProtocolFilename;
try try
Config:=DefaultConfigClass.Create(Filename,true); Config:=DefaultConfigClass.Create(Filename,true);
try try
@ -100,7 +101,7 @@ var
Config: TConfigStorage; Config: TConfigStorage;
begin begin
if Filename='' then if Filename='' then
Filename:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+IDEProtocolFilename; Filename:=AppendPathDelim(GetPrimaryConfigPath)+IDEProtocolFilename;
try try
Config:=DefaultConfigClass.Create(Filename,false); Config:=DefaultConfigClass.Create(Filename,false);
try try

4
ide/inputhistory.pas
View File

@ -38,7 +38,7 @@ interface
uses uses
Classes, SysUtils, FileProcs, LazFileCache, DiffPatch, IDEProcs, Classes, SysUtils, FileProcs, LazFileCache, DiffPatch, IDEProcs,
AvgLvlTree, Laz2_XMLCfg, SynEditTypes, LazConf, Dialogs, LazUTF8, IDEDialogs, AvgLvlTree, Laz2_XMLCfg, SynEditTypes, LazConf, Dialogs, LazUTF8, IDEDialogs,
ProjectIntf; ProjectIntf, LazFileUtils;
{$ifdef Windows} {$ifdef Windows}
{$define CaseInsensitiveFilenames} {$define CaseInsensitiveFilenames}
@ -577,7 +577,7 @@ procedure TInputHistories.SetLazarusDefaultFilename;
var var
ConfFileName: string; ConfFileName: string;
begin begin
ConfFileName:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+DefaultHistoryFile; ConfFileName:=AppendPathDelim(GetPrimaryConfigPath)+DefaultHistoryFile;
CopySecondaryConfigFile(DefaultHistoryFile); CopySecondaryConfigFile(DefaultHistoryFile);
FFilename:=ConfFilename; FFilename:=ConfFilename;
end; end;