New file imports

Villavu · Jul 9, 2023 · 4daca8f · 4daca8f
1 parent d2594d8
commit 4daca8f
Show file tree

Hide file tree

Showing 27 changed files with 1,073 additions and 232 deletions.
diff --git a/Source/codetools/simba.ide_codetools_setup.pas b/Source/codetools/simba.ide_codetools_setup.pas
@@ -14,7 +14,7 @@ implementation
 
 uses
   simba.mufasatypes, simba.ide_codetools_parser, simba.ide_codetools_insight,
-  simba.ide_initialization, simba.process, simba.files, simba.ide_events;
+  simba.ide_initialization, simba.process, simba.env, simba.ide_events;
 
 procedure SetupCodeTools;
 var

diff --git a/Source/codetools/simba.ide_codetools_utils.pas b/Source/codetools/simba.ide_codetools_utils.pas
@@ -47,7 +47,7 @@ function FindPluginExports(FileName: String): String;
 implementation
 
 uses
-  simba.mufasatypes, simba.files, simba.process;
+  simba.mufasatypes, simba.env, simba.process;
 
 procedure TNullableString.SetValue(const AValue: String);
 begin

diff --git a/Source/forms/simba.aboutform.pas b/Source/forms/simba.aboutform.pas
@@ -38,7 +38,7 @@ implementation
 
 uses
   lclintf, lazversion,
-  simba.files;
+  simba.env;
 
 procedure TSimbaAboutForm.DoFirstShow(Sender: TObject);
 begin

diff --git a/Source/forms/simba.main.pas b/Source/forms/simba.main.pas
@@ -281,7 +281,7 @@ implementation
 
   simba.windowselector, simba.colorpicker,
 
-  simba.openssl, simba.files, simba.process,
+  simba.openssl, simba.env, simba.process,
   simba.dockinghelpers, simba.nativeinterface,
   simba.scriptformatter, simba.windowhandle, simba.scripttab, simba.theme;
 

diff --git a/Source/forms/simba.scripttabsform.pas b/Source/forms/simba.scripttabsform.pas
@@ -103,7 +103,7 @@ implementation
 
 uses
   LCLType,
-  simba.mufasatypes, simba.files, simba.editor_docgenerator, simba.main,
+  simba.mufasatypes, simba.env, simba.editor_docgenerator, simba.main,
   simba.dockinghelpers, simba.nativeinterface, simba.outputform,
   simba.ide_events, simba.theme, simba.settings;
 

diff --git a/Source/forms/simba.settingsform_backup.pas b/Source/forms/simba.settingsform_backup.pas
@@ -34,7 +34,7 @@ implementation
 {$R *.lfm}
 
 uses
-  simba.files, simba.settings;
+  simba.env, simba.settings;
 
 constructor TSimbaBackupFrame.Create(AOwner: TComponent);
 begin

diff --git a/Source/forms/simba.settingsform_editor_colors.pas b/Source/forms/simba.settingsform_editor_colors.pas
@@ -79,7 +79,7 @@ implementation
 
 uses
   SynEditMiscClasses,
-  simba.settings, simba.editor_attributes, simba.files, simba.mufasatypes,
+  simba.settings, simba.editor_attributes, simba.env, simba.mufasatypes,
   simba.httpclient;
 
 type

diff --git a/Source/forms/simba.shapeboxform.pas b/Source/forms/simba.shapeboxform.pas
@@ -11,7 +11,7 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Menus, ExtCtrls,
-  simba.shapebox, simba.files;
+  simba.mufasatypes, simba.shapebox, simba.env;
 
 type
   TSimbaShapeBoxForm = class(TForm)
@@ -38,9 +38,6 @@   TSimbaShapeBoxForm = class(TForm)
 
 implementation
 
-uses
-  simba.mufasatypes;
-
 procedure TSimbaShapeBoxForm.FormCreate(Sender: TObject);
 begin
   ShapeBox := TSimbaShapeBox.Create(Self);

diff --git a/Source/forms/simba.showdeclarationform.pas b/Source/forms/simba.showdeclarationform.pas
@@ -29,7 +29,7 @@   TShowDeclarationForm = class(TForm)
 implementation
 
 uses
-  simba.main, simba.ide_showdeclaration, simba.files;
+  simba.main, simba.ide_showdeclaration, simba.env;
 
 {$R *.lfm}
 

diff --git a/Source/package/simba.package.pas b/Source/package/simba.package.pas
@@ -105,7 +105,7 @@ implementation
 
 uses
   inifiles, dateutils, fileutil, lazfileutils,
-  simba.files, simba.mufasatypes, simba.httpclient,
+  simba.env, simba.mufasatypes, simba.httpclient,
   simba.package_endpoint_github, simba.package_endpoint_custom, simba.threading;
 
 function LoadPackageURLs: TStringArray;

diff --git a/Source/package/simba.package_endpoint_github.pas b/Source/package/simba.package_endpoint_github.pas
@@ -31,7 +31,7 @@ implementation
 
 uses
   forms, fpjson, dateutils,
-  simba.httpclient, simba.files, simba.mufasatypes;
+  simba.httpclient, simba.env, simba.mufasatypes;
 
 const
   URL_REPOS            = 'https://api.github.com/repos/%s/%s';                       // {Owner} {Name}

diff --git a/Source/package/simba.package_installer.pas b/Source/package/simba.package_installer.pas
@@ -58,7 +58,7 @@ implementation
 
 uses
   Forms, FileUtil,
-  simba.mufasatypes, simba.files, simba.threading;
+  simba.mufasatypes, simba.files, simba.threading, simba.env;
 
 function TSimbaPackageInstaller.InternalInstall(URL: String; Path: String; IgnoreList: TStringArray; Flat: Boolean): Boolean;
 

diff --git a/Source/package/simba.package_installform.pas b/Source/package/simba.package_installform.pas
@@ -45,7 +45,7 @@ implementation
 {$R *.lfm}
 
 uses
-  simba.mufasatypes, simba.files, simba.fonthelpers, simba.dialog;
+  simba.mufasatypes, simba.env, simba.fonthelpers, simba.dialog;
 
 constructor TSimbaPackageInstallForm.Create(AOwner: TComponent; APackage: TSimbaPackage);
 var