refactor: prefer Delphi friendly SysUtils.PathDelim over System.DirectorySeparator

Author: ansgarbecker

source/apphelpers.pas

@@ -1284,7 +1284,7 @@ function GetLibDir: String;
   Result := GetAppDir;
   {$ENDIF}
   {$IFDEF DARWIN}
-  Result := GetAppDir + '..' + DirectorySeparator + 'Frameworks' + DirectorySeparator;
+  Result := GetAppDir + '..' + PathDelim + 'Frameworks' + PathDelim;
   {$ENDIF}
   {$IFDEF LINUX}
   Result := '';
@@ -1301,15 +1301,15 @@ function GetPluginDir: String;
   // macOS: use the Frameworks directory, where all other libs reside
   Result := GetLibDir;
   {$IFDEF WINDOWS}
-  Result := Result + 'plugins' + DirectorySeparator;
+  Result := Result + 'plugins' + PathDelim;
   {$ENDIF}
 end;
 
 function GetResourcesDir: String;
 begin
   Result := GetAppDir;
   {$IFDEF DARWIN}
-  Result := GetAppDir + '..' + DirectorySeparator + 'Resources' + DirectorySeparator;
+  Result := GetAppDir + '..' + PathDelim + 'Resources' + PathDelim;
   {$ENDIF}
   {$IFDEF FREEBSD}
   Result := '/usr/local/share/heidisql/';
@@ -3580,7 +3580,7 @@ constructor TAppSettings.Create;
   InitSetting(asIgnoreDatabasePattern,            'IgnoreDatabasePattern',                 0, False, '', True);
   InitSetting(asLogFileDdl,                       'LogFileDdl',                            0, False, '', True);
   InitSetting(asLogFileDml,                       'LogFileDml',                            0, False, '', True);
-  InitSetting(asLogFilePath,                      'LogFilePath',                           0, False, DirnameUserAppData + 'Logs'+DirectorySeparator+'%session'+DirectorySeparator+'%db'+DirectorySeparator+'%y%m%d.sql', True);
+  InitSetting(asLogFilePath,                      'LogFilePath',                           0, False, DirnameUserAppData + 'Logs'+PathDelim+'%session'+PathDelim+'%db'+PathDelim+'%y%m%d.sql', True);
   if Screen.Fonts.IndexOf('Consolas') > -1 then
     InitSetting(asFontName,                       'FontName',                              0, False, 'Consolas')
   else
@@ -3596,7 +3596,7 @@ constructor TAppSettings.Create;
   InitSetting(asHightlightSameTextBackground,     'HightlightSameTextBackground',          GetThemeColor(NoteLineBackground));
   InitSetting(asLogsqlnum,                        'logsqlnum',                             300);
   InitSetting(asLogsqlwidth,                      'logsqlwidth',                           2000);
-  InitSetting(asSessionLogsDirectory,             'SessionLogsDirectory',                  0, False, DirnameUserAppData + 'Sessionlogs' + DirectorySeparator);
+  InitSetting(asSessionLogsDirectory,             'SessionLogsDirectory',                  0, False, DirnameUserAppData + 'Sessionlogs' + PathDelim);
   InitSetting(asLogHorizontalScrollbar,           'LogHorizontalScrollbar',                0, False);
   InitSetting(asSQLColActiveLine,                 'SQLColActiveLine',                      0, False, 'clNone');
   InitSetting(asSQLColMatchingBraceForeground,    'SQLColMatchingBraceForeground',         0, False, 'clBlack');
@@ -3795,7 +3795,7 @@ constructor TAppSettings.Create;
   InitSetting(asDisplayReverseForeignKeys,        'DisplayReverseForeignKeys',             0, False);
   InitSetting(asGenerateDataNumRows,              'GenerateDataNumRows',                   1000);
   InitSetting(asGenerateDataNullAmount,           'GenerateDataNullAmount',                10);
-  InitSetting(asCustomSnippetsDirectory,          'CustomSnippetsDirectory',               0, False, DirnameUserDocuments + 'Snippets' + DirectorySeparator);
+  InitSetting(asCustomSnippetsDirectory,          'CustomSnippetsDirectory',               0, False, DirnameUserDocuments + 'Snippets' + PathDelim);
   InitSetting(asPromptSaveFileOnTabClose,         'PromptSaveFileOnTabClose',              0, True);
   // Restore tabs feature crashes often on old XP systems, see https://www.heidisql.com/forum.php?t=34044
   InitSetting(asRestoreTabs,                      'RestoreTabs',                           0, True);
@@ -4448,7 +4448,7 @@ function TAppSettings.DirnameSnippets: String;
 function TAppSettings.DirnameBackups: String;
 begin
   // Create backup folder if it does not exist and return it
-  Result := DirnameUserAppData + 'Backups' + DirectorySeparator;
+  Result := DirnameUserAppData + 'Backups' + PathDelim;
   if not DirectoryExists(Result) then begin
     ForceDirectories(Result);
   end;
@@ -4457,7 +4457,7 @@ function TAppSettings.DirnameBackups: String;
 
 function TAppSettings.DirnameHighlighters: string;
 begin
-  Result := DirnameUserAppData + 'Highlighters' + DirectorySeparator;
+  Result := DirnameUserAppData + 'Highlighters' + PathDelim;
   if not DirectoryExists(Result) then begin
     ForceDirectories(Result);
   end;

source/main.pas

@@ -5242,7 +5242,7 @@ procedure TMainform.popupQueryLoadClick(Sender: TObject);
   // Click on the popupQueryLoad
   Filename := (Sender as TMenuItem).Caption;
   Filename := StripHotkey(Filename);
-  if Pos(DirectorySeparator, Filename) = 0 then // assuming we load a snippet
+  if Pos(PathDelim, Filename) = 0 then // assuming we load a snippet
     Filename := AppSettings.DirnameSnippets + Filename + FILEEXT_SNIPPET
   else begin // assuming we load a file from the recent-list
     p := Pos(' ', Filename) + 1;

source/tabletools.pas

@@ -1821,7 +1821,7 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
 
   if ToDir then begin
     FreeAndNil(ExportStream);
-    DbDir := GetOutputFilename(comboExportOutputTarget.Text, DBObj) + DirectorySeparator + DBObj.Database + DirectorySeparator;
+    DbDir := GetOutputFilename(comboExportOutputTarget.Text, DBObj) + PathDelim + DBObj.Database + PathDelim;
     if not DirectoryExists(DbDir) then
       ForceDirectories(DbDir);
     ExportStream := TFileStream.Create(DbDir + DBObj.ObjType.ToLower + '-' + DBObj.Name+'.sql', fmCreate or fmOpenWrite);