ide: refactoring: use AppendPathDelim/IncludeTrailingPathDelimiter for config paths.

git-svn-id: trunk@51401 -

ide/buildlazdialog.pas

@@ -318,7 +318,7 @@ begin
   CleanDir(fWorkingDir+PathDelim+'test');
 
   // clean config directory
-  CleanDir(GetPrimaryConfigPath+PathDelim+'units');
+  CleanDir(AppendPathDelim(GetPrimaryConfigPath)+'units');
 
   // clean custom target directory
   if fProfile.TargetDirectory<>'' then begin

ide/codetoolsoptions.pas

@@ -538,7 +538,7 @@ begin
       XMLConfig.GetValue('CodeToolsOptions/Indentation/OnPaste/Enabled',true);
     fIndentationFilename :=
       XMLConfig.GetValue('CodeToolsOptions/Indentation/FileName'
-      , TrimFilename(GetPrimaryConfigPath + PathDelim +DefaultIndentationFilename));
+      , TrimFilename(AppendPathDelim(GetPrimaryConfigPath)+DefaultIndentationFilename));
     FIndentContextSensitive :=
       XMLConfig.GetValue('CodeToolsOptions/Indentation/ContextSensitive',true);
 
@@ -732,7 +732,7 @@ procedure TCodeToolsOptions.SetLazarusDefaultFilename;
 var
   ConfFileName: string;
 begin
-  ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+DefaultCodeToolsOptsFile);
+  ConfFileName:=AppendPathDelim(GetPrimaryConfigPath)+DefaultCodeToolsOptsFile;
   CopySecondaryConfigFile(DefaultCodeToolsOptsFile);
   if (not FileExistsCached(ConfFileName)) then begin
     debugln('Looking for code tools config file:  "' + ConfFileName + '"');
@@ -899,7 +899,7 @@ begin
   FIndentOnLineBreak:=true;
   FIndentOnPaste:=true;
   fIndentationFilename:=
-    TrimFilename(GetPrimaryConfigPath+PathDelim+DefaultIndentationFilename);
+    TrimFilename(AppendPathDelim(GetPrimaryConfigPath)+DefaultIndentationFilename);
   FIndentContextSensitive:=true;
 
   // code completion templates

ide/editoroptions.pp

@@ -2401,7 +2401,7 @@ end;
 
 function UserSchemeDirectory(CreateIfNotExists: Boolean): String;
 begin
-  Result := GetPrimaryConfigPath + DirectorySeparator + 'userschemes';
+  Result := AppendPathDelim(GetPrimaryConfigPath) + 'userschemes';
   If CreateIfNotExists and (not DirectoryExistsUTF8(Result)) then
     CreateDirUTF8(Result);
 end;
@@ -4412,8 +4412,7 @@ begin
   inherited Create;
   InitLocale;
 
-  ConfFileName := SetDirSeparators(GetPrimaryConfigPath + '/' +
+  ConfFileName := AppendPathDelim(GetPrimaryConfigPath) + EditOptsConfFileName;
-    EditOptsConfFileName);
   CopySecondaryConfigFile(EditOptsConfFileName);
   try
     if (not FileExistsUTF8(ConfFileName)) then
@@ -4436,7 +4435,7 @@ begin
 
   // code templates (dci file)
   fCodeTemplateFileName :=
-    TrimFilename(GetPrimaryConfigPath+PathDelim+DefaultCodeTemplatesFilename);
+    TrimFilename(AppendPathDelim(GetPrimaryConfigPath)+DefaultCodeTemplatesFilename);
   CopySecondaryConfigFile(DefaultCodeTemplatesFilename);
   if not FileExistsUTF8(CodeTemplateFileName) then
   begin
@@ -4784,7 +4783,7 @@ begin
       XMLConfig.GetValue('EditorOptions/CodeTools/AutoDelayInMSec', 1000);
     fCodeTemplateFileName :=
       XMLConfig.GetValue('EditorOptions/CodeTools/CodeTemplateFileName'
-      , TrimFilename(GetPrimaryConfigPath + PathDelim + DefaultCodeTemplatesFilename));
+      , TrimFilename(AppendPathDelim(GetPrimaryConfigPath) + DefaultCodeTemplatesFilename));
     fCTemplIndentToTokenStart :=
       XMLConfig.GetValue(
       'EditorOptions/CodeTools/CodeTemplateIndentToTokenStart/Value', False);

ide/encloseifdef.pas

@@ -433,7 +433,7 @@ var
   ConfFileName: String;
 begin
   Result:=nil;
-  ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/encloseifdef.xml');
+  ConfFileName:=AppendPathDelim(GetPrimaryConfigPath)+'encloseifdef.xml';
   try
     if (not FileExistsUTF8(ConfFileName)) then
       Result:=TXMLConfig.CreateClean(ConfFileName)

ide/helpoptions.pas

@@ -209,7 +209,7 @@ procedure THelpOptions.SetDefaultFilename;
 var
   ConfFileName: string;
 begin
-  ConfFileName := SetDirSeparators(GetPrimaryConfigPath+'/'+DefaultHelpOptsFile);
+  ConfFileName := AppendPathDelim(GetPrimaryConfigPath)+DefaultHelpOptsFile;
   CopySecondaryConfigFile(DefaultHelpOptsFile);
   if (not FileExistsUTF8(ConfFileName)) then
     DebugLn('NOTE: help options config file not found - using defaults');

ide/ideprotocol.pas

@@ -80,7 +80,7 @@ var
   Config: TConfigStorage;
 begin
   if Filename='' then
-    Filename:=SetDirSeparators(GetPrimaryConfigPath+'/'+IDEProtocolFilename);
+    Filename:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+IDEProtocolFilename;
   try
     Config:=DefaultConfigClass.Create(Filename,true);
     try
@@ -100,7 +100,7 @@ var
   Config: TConfigStorage;
 begin
   if Filename='' then
-    Filename:=SetDirSeparators(GetPrimaryConfigPath+'/'+IDEProtocolFilename);
+    Filename:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+IDEProtocolFilename;
   try
     Config:=DefaultConfigClass.Create(Filename,false);
     try

ide/inputhistory.pas

@@ -577,7 +577,7 @@ procedure TInputHistories.SetLazarusDefaultFilename;
 var
   ConfFileName: string;
 begin
-  ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+DefaultHistoryFile);
+  ConfFileName:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+DefaultHistoryFile;
   CopySecondaryConfigFile(DefaultHistoryFile);
   FFilename:=ConfFilename;
 end;

ide/main.pp

@@ -1063,7 +1063,7 @@ begin
     HelpLang := GetLanguageSpecified;
     if HelpLang = '' then
     begin
-      ConfFileName:=TrimFilename(SetDirSeparators(GetPrimaryConfigPath+'/'+EnvOptsConfFileName));
+      ConfFileName:=TrimFilename(AppendPathDelim(GetPrimaryConfigPath)+EnvOptsConfFileName);
       try
         Cfg:=TXMLConfig.Create(ConfFileName);
         try

ide/miscoptions.pas

@@ -222,7 +222,7 @@ var
   ConfFileName: string;
 begin
   if fFilename='' then begin
-    ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+MiscOptsFilename);
+    ConfFileName:=AppendPathDelim(GetPrimaryConfigPath)+MiscOptsFilename;
     CopySecondaryConfigFile(MiscOptsFilename);
     if (not FileExistsUTF8(ConfFileName)) then begin
       //DebugLn('Note: miscellaneous options file not found - using defaults');