diff --git a/Projects/Src/Shared.BrowseFunc.pas b/Components/BrowseFunc.pas
similarity index 96%
rename from Projects/Src/Shared.BrowseFunc.pas
rename to Components/BrowseFunc.pas
index 6f45dbe37..ed01ea520 100644
--- a/Projects/Src/Shared.BrowseFunc.pas
+++ b/Components/BrowseFunc.pas
@@ -1,4 +1,4 @@
-unit Shared.BrowseFunc;
+unit BrowseFunc;
{
Inno Setup
diff --git a/Projects/Src/Shared.SafeDLLPath.pas b/Components/SafeDLLPath.pas
similarity index 96%
rename from Projects/Src/Shared.SafeDLLPath.pas
rename to Components/SafeDLLPath.pas
index c1f4a52d5..b081b4643 100644
--- a/Projects/Src/Shared.SafeDLLPath.pas
+++ b/Components/SafeDLLPath.pas
@@ -1,4 +1,4 @@
-unit Shared.SafeDLLPath;
+unit SafeDLLPath;
{
Inno Setup
diff --git a/Projects/Src/Shared.SimpleExpression.pas b/Components/SimpleExpression.pas
similarity index 96%
rename from Projects/Src/Shared.SimpleExpression.pas
rename to Components/SimpleExpression.pas
index b0bcd7b5a..c1b408ebc 100644
--- a/Projects/Src/Shared.SimpleExpression.pas
+++ b/Components/SimpleExpression.pas
@@ -1,4 +1,4 @@
-unit Shared.SimpleExpression;
+unit SimpleExpression;
{
Inno Setup
diff --git a/Projects/Src/Shared.TaskbarProgressFunc.pas b/Components/TaskbarProgressFunc.pas
similarity index 94%
rename from Projects/Src/Shared.TaskbarProgressFunc.pas
rename to Components/TaskbarProgressFunc.pas
index 4a04e161d..cb988d79f 100644
--- a/Projects/Src/Shared.TaskbarProgressFunc.pas
+++ b/Components/TaskbarProgressFunc.pas
@@ -1,4 +1,4 @@
-unit Shared.TaskbarProgressFunc;
+unit TaskbarProgressFunc;
{
Inno Setup
diff --git a/Projects/Src/Shared.UIStateForm.pas b/Components/UIStateForm.pas
similarity index 94%
rename from Projects/Src/Shared.UIStateForm.pas
rename to Components/UIStateForm.pas
index ca69765a0..07cf6305e 100644
--- a/Projects/Src/Shared.UIStateForm.pas
+++ b/Components/UIStateForm.pas
@@ -1,4 +1,4 @@
-unit Shared.UIStateForm;
+unit UIStateForm;
{
Inno Setup
diff --git a/Projects/Compil32.dpr b/Projects/Compil32.dpr
index 70b69925d..91d5cb4be 100644
--- a/Projects/Compil32.dpr
+++ b/Projects/Compil32.dpr
@@ -10,7 +10,7 @@ program Compil32;
}
uses
- Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+ SafeDLLPath in '..\Components\SafeDLLPath.pas',
Windows,
SysUtils,
Forms,
@@ -29,7 +29,7 @@ uses
NewUxTheme.TmSchema in '..\Components\NewUxTheme.TmSchema.pas',
NewUxTheme in '..\Components\NewUxTheme.pas',
Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
- Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
+ BrowseFunc in '..\Components\BrowseFunc.pas',
IDE.SignToolsForm in 'Src\IDE.SignToolsForm.pas' {SignToolsForm},
IDE.InputQueryComboForm in 'Src\IDE.InputQueryComboForm.pas',
ScintInt in '..\Components\ScintInt.pas',
@@ -46,9 +46,9 @@ uses
DropListBox in '..\Components\DropListBox.pas',
NewCheckListBox in '..\Components\NewCheckListBox.pas',
NewNotebook in '..\Components\NewNotebook.pas',
- Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
+ TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',
IDE.HtmlHelpFunc in 'Src\IDE.HtmlHelpFunc.pas',
- Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
+ UIStateForm in '..\Components\UIStateForm.pas',
Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
diff --git a/Projects/Compil32.dproj b/Projects/Compil32.dproj
index 2c12939ad..8e2630f7b 100644
--- a/Projects/Compil32.dproj
+++ b/Projects/Compil32.dproj
@@ -75,7 +75,7 @@
MainSource
-
+
@@ -101,7 +101,7 @@
-
+
@@ -124,9 +124,9 @@
-
+
-
+
diff --git a/Projects/ISCC.dpr b/Projects/ISCC.dpr
index eeca3b6b0..e8497afa6 100644
--- a/Projects/ISCC.dpr
+++ b/Projects/ISCC.dpr
@@ -15,7 +15,7 @@ program ISCC;
into this program and not depend on ISCmplr.dll. }
uses
- Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+ SafeDLLPath in '..\Components\SafeDLLPath.pas',
Windows,
SysUtils,
Classes,
diff --git a/Projects/ISCC.dproj b/Projects/ISCC.dproj
index cd32165cd..d5b698c44 100644
--- a/Projects/ISCC.dproj
+++ b/Projects/ISCC.dproj
@@ -74,7 +74,7 @@
MainSource
-
+
diff --git a/Projects/ISCmplr.dpr b/Projects/ISCmplr.dpr
index 09d3d15ab..dd2c9549b 100644
--- a/Projects/ISCmplr.dpr
+++ b/Projects/ISCmplr.dpr
@@ -10,7 +10,7 @@ library ISCmplr;
}
uses
- Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+ SafeDLLPath in '..\Components\SafeDLLPath.pas',
SysUtils,
Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
Shared.PreprocInt in 'Src\Shared.PreprocInt.pas',
@@ -40,7 +40,7 @@ uses
Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
- Shared.SimpleExpression in 'Src\Shared.SimpleExpression.pas',
+ SimpleExpression in '..\Components\SimpleExpression.pas',
MD5 in '..\Components\MD5.pas',
Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas';
diff --git a/Projects/ISCmplr.dproj b/Projects/ISCmplr.dproj
index a52bf64b4..2575f47be 100644
--- a/Projects/ISCmplr.dproj
+++ b/Projects/ISCmplr.dproj
@@ -77,7 +77,7 @@
MainSource
-
+
@@ -106,7 +106,7 @@
-
+
diff --git a/Projects/Setup.dpr b/Projects/Setup.dpr
index e0a545697..2c27b85ad 100644
--- a/Projects/Setup.dpr
+++ b/Projects/Setup.dpr
@@ -10,7 +10,7 @@ program Setup;
}
uses
- Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+ SafeDLLPath in '..\Components\SafeDLLPath.pas',
Setup.XPTheme in 'Src\Setup.XPTheme.pas',
Forms,
Windows,
@@ -53,11 +53,11 @@ uses
Setup.Uninstall in 'Src\Setup.Uninstall.pas',
Setup.UninstallProgressForm in 'Src\Setup.UninstallProgressForm.pas' {UninstallProgressForm},
Setup.UninstallSharedFileForm in 'Src\Setup.UninstallSharedFileForm.pas' {UninstallSharedFileForm},
- Shared.SimpleExpression in 'Src\Shared.SimpleExpression.pas',
- Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
+ SimpleExpression in '..\Components\SimpleExpression.pas',
+ UIStateForm in '..\Components\UIStateForm.pas',
Setup.SetupForm in 'Src\Setup.SetupForm.pas',
Setup.RegSvr in 'Src\Setup.RegSvr.pas',
- Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
+ BrowseFunc in '..\Components\BrowseFunc.pas',
Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
Setup.SecurityFunc in 'Src\Setup.SecurityFunc.pas',
Setup.Helper in 'Src\Setup.Helper.pas',
@@ -82,7 +82,7 @@ uses
RestartManager in '..\Components\RestartManager.pas',
Resample in '..\Components\Resample.pas',
ASMInline in '..\Components\ASMInline.pas',
- Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
+ TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',
Setup.DotNetFunc in 'Src\Setup.DotNetFunc.pas',
Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
Setup.MsiFunc in 'Src\Setup.MsiFunc.pas',
diff --git a/Projects/Setup.dproj b/Projects/Setup.dproj
index beb888ba8..0138c54a6 100644
--- a/Projects/Setup.dproj
+++ b/Projects/Setup.dproj
@@ -73,7 +73,7 @@
MainSource
-
+
@@ -126,11 +126,11 @@
-
-
+
+
-
+
@@ -155,7 +155,7 @@
-
+
diff --git a/Projects/SetupLdr.dpr b/Projects/SetupLdr.dpr
index 7d7415b3e..39fd747be 100644
--- a/Projects/SetupLdr.dpr
+++ b/Projects/SetupLdr.dpr
@@ -10,7 +10,7 @@ program SetupLdr;
}
uses
- Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+ SafeDLLPath in '..\Components\SafeDLLPath.pas',
Setup.XPTheme in 'Src\Setup.XPTheme.pas',
Windows,
Messages,
diff --git a/Projects/SetupLdr.dproj b/Projects/SetupLdr.dproj
index 0366aa42f..10438570f 100644
--- a/Projects/SetupLdr.dproj
+++ b/Projects/SetupLdr.dproj
@@ -70,7 +70,7 @@
MainSource
-
+
diff --git a/Projects/Src/Compiler.Compile.pas b/Projects/Src/Compiler.Compile.pas
index b6c1ea8e4..370a3e3d3 100644
--- a/Projects/Src/Compiler.Compile.pas
+++ b/Projects/Src/Compiler.Compile.pas
@@ -38,7 +38,7 @@ implementation
{$IFDEF STATICPREPROC}
IsppPreprocess,
{$ENDIF}
- Compiler.ScriptCompiler, Shared.SimpleExpression, Shared.SetupTypes;
+ Compiler.ScriptCompiler, SimpleExpression, Shared.SetupTypes;
type
TParamInfo = record
diff --git a/Projects/Src/IDE.CompileForm.pas b/Projects/Src/IDE.CompileForm.pas
index 4aa71e393..5d7d49e0d 100644
--- a/Projects/Src/IDE.CompileForm.pas
+++ b/Projects/Src/IDE.CompileForm.pas
@@ -23,7 +23,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Contnrs, Graphics, Controls, Forms, Dialogs, CommDlg,
- Generics.Collections, Shared.UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
+ Generics.Collections, UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
ScintInt, ScintEdit, IDE.ScintStylerInnoSetup, NewTabSet, ModernColors, IDE.CompScintEdit,
Shared.DebugStruct, Shared.CompilerInt, NewUxTheme, ImageList, ImgList, ToolWin, IDE.HelperFunc,
VirtualImageList, BaseImageCollection, ImageCollection;
@@ -651,8 +651,8 @@ implementation
uses
ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes,
Math, StrUtils, WideStrUtils,
- PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, Shared.BrowseFunc,
- IDE.HtmlHelpFunc, Shared.TaskbarProgressFunc,
+ PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, BrowseFunc,
+ IDE.HtmlHelpFunc, TaskbarProgressFunc,
{$IFDEF STATICCOMPILER} Compile, {$ENDIF}
IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm,
Shared.ConfigIniFile, Shared.SignToolsFunc, IDE.InputQueryComboForm, IDE.MsgBoxDesignerForm,
diff --git a/Projects/Src/IDE.FilesDesignerForm.pas b/Projects/Src/IDE.FilesDesignerForm.pas
index f27fad57c..831c395ca 100644
--- a/Projects/Src/IDE.FilesDesignerForm.pas
+++ b/Projects/Src/IDE.FilesDesignerForm.pas
@@ -13,7 +13,7 @@ interface
uses
Classes, Controls, Forms, Dialogs, ExtCtrls, StdCtrls,
- Shared.UIStateForm, NewStaticText, DropListBox, IDE.Wizard.WizardFormFilesHelper;
+ UIStateForm, NewStaticText, DropListBox, IDE.Wizard.WizardFormFilesHelper;
type
TFilesDesignerForm = class(TUIStateForm)
diff --git a/Projects/Src/IDE.InputQueryComboForm.pas b/Projects/Src/IDE.InputQueryComboForm.pas
index 0592a9135..eac52e713 100644
--- a/Projects/Src/IDE.InputQueryComboForm.pas
+++ b/Projects/Src/IDE.InputQueryComboForm.pas
@@ -12,7 +12,7 @@
interface
uses
- Classes, Controls, StdCtrls, Shared.UIStateForm;
+ Classes, Controls, StdCtrls, UIStateForm;
type
TInputQueryComboForm = class(TUIStateForm)
diff --git a/Projects/Src/IDE.MsgBoxDesignerForm.pas b/Projects/Src/IDE.MsgBoxDesignerForm.pas
index 39cdea7d3..467785279 100644
--- a/Projects/Src/IDE.MsgBoxDesignerForm.pas
+++ b/Projects/Src/IDE.MsgBoxDesignerForm.pas
@@ -15,7 +15,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- Shared.UIStateForm, StdCtrls, ExtCtrls, NewStaticText, ComCtrls, pngimage;
+ UIStateForm, StdCtrls, ExtCtrls, NewStaticText, ComCtrls, pngimage;
type
TMsgBoxDesignerForm = class(TUIStateForm)
diff --git a/Projects/Src/IDE.OptionsForm.pas b/Projects/Src/IDE.OptionsForm.pas
index c43664973..2dd86e714 100644
--- a/Projects/Src/IDE.OptionsForm.pas
+++ b/Projects/Src/IDE.OptionsForm.pas
@@ -13,7 +13,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- Shared.UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
+ UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
type
TOptionsForm = class(TUIStateForm)
diff --git a/Projects/Src/IDE.SignToolsForm.pas b/Projects/Src/IDE.SignToolsForm.pas
index 1ac0f9f40..4e0886594 100644
--- a/Projects/Src/IDE.SignToolsForm.pas
+++ b/Projects/Src/IDE.SignToolsForm.pas
@@ -12,7 +12,7 @@
interface
uses
- Classes, Controls, StdCtrls, Shared.UIStateForm;
+ Classes, Controls, StdCtrls, UIStateForm;
type
TSignToolsForm = class(TUIStateForm)
diff --git a/Projects/Src/IDE.StartupForm.pas b/Projects/Src/IDE.StartupForm.pas
index ebc2161cc..7c456ae19 100644
--- a/Projects/Src/IDE.StartupForm.pas
+++ b/Projects/Src/IDE.StartupForm.pas
@@ -13,7 +13,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- Shared.UIStateForm, StdCtrls, ExtCtrls;
+ UIStateForm, StdCtrls, ExtCtrls;
type
TStartupFormResult = (srNone, srEmpty, srWizard, srOpenFile, srOpenDialog,
diff --git a/Projects/Src/IDE.Wizard.WizardFileForm.pas b/Projects/Src/IDE.Wizard.WizardFileForm.pas
index cb399a2ab..662d9a90e 100644
--- a/Projects/Src/IDE.Wizard.WizardFileForm.pas
+++ b/Projects/Src/IDE.Wizard.WizardFileForm.pas
@@ -13,7 +13,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- Shared.UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
+ UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
type
diff --git a/Projects/Src/IDE.Wizard.WizardForm.pas b/Projects/Src/IDE.Wizard.WizardForm.pas
index 0d31cdb94..5bc532d12 100644
--- a/Projects/Src/IDE.Wizard.WizardForm.pas
+++ b/Projects/Src/IDE.Wizard.WizardForm.pas
@@ -13,7 +13,7 @@ interface
uses
Windows, Forms, Classes, Graphics, StdCtrls, ExtCtrls, Controls, Dialogs, pngimage,
- Shared.UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
+ UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
IDE.Wizard.WizardFormFilesHelper, IDE.Wizard.WizardFormRegistryHelper;
type
@@ -187,7 +187,7 @@ implementation
uses
SysUtils, ShlObj, ActiveX, UITypes, Shared.FileClass,
- PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, Shared.BrowseFunc,
+ PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, BrowseFunc,
IDE.Messages, IDE.Wizard.WizardFileForm;
type
diff --git a/Projects/Src/IDE.Wizard.WizardFormFilesHelper.pas b/Projects/Src/IDE.Wizard.WizardFormFilesHelper.pas
index 716a6a475..6b6d54b3a 100644
--- a/Projects/Src/IDE.Wizard.WizardFormFilesHelper.pas
+++ b/Projects/Src/IDE.Wizard.WizardFormFilesHelper.pas
@@ -48,7 +48,7 @@ implementation
uses
SysUtils, UITypes,
- Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc, PathFunc,
+ Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc, PathFunc,
IDE.Messages, IDE.Wizard.WizardFileForm;
constructor TWizardFormFilesHelper.Create(const Form: TForm;
diff --git a/Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas b/Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas
index 499a41990..9b2f6c815 100644
--- a/Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas
+++ b/Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas
@@ -47,7 +47,7 @@ implementation
uses
Windows, Classes, SysUtils, StrUtils, TypInfo, Graphics, UITypes,
ComCtrls,
- IDE.CompileForm, IDE.HelperFunc, IDE.Messages, Shared.BrowseFunc, Shared.CommonFunc, IDE.HtmlHelpFunc;
+ IDE.CompileForm, IDE.HelperFunc, IDE.Messages, BrowseFunc, Shared.CommonFunc, IDE.HtmlHelpFunc;
{ TWizardFormRegistryHelper }
diff --git a/Projects/Src/Setup.Install.pas b/Projects/Src/Setup.Install.pas
index 08b3bdf38..2e9ee6499 100644
--- a/Projects/Src/Setup.Install.pas
+++ b/Projects/Src/Setup.Install.pas
@@ -33,7 +33,7 @@ implementation
Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
Compression.Base, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfoFunc, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
- Shared.ResUpdateFunc, Setup.DotNetFunc, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
+ Shared.ResUpdateFunc, Setup.DotNetFunc, TaskbarProgressFunc, NewProgressBar, RestartManager,
Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;
type
diff --git a/Projects/Src/Setup.MainForm.pas b/Projects/Src/Setup.MainForm.pas
index cbb0a6029..9881d6833 100644
--- a/Projects/Src/Setup.MainForm.pas
+++ b/Projects/Src/Setup.MainForm.pas
@@ -270,7 +270,7 @@ implementation
Setup.Messages, Shared.SetupMessageIDs, Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.RedirFunc, PathFunc,
Compression.Base, Compression.Zlib, Compression.bzlib, Compression.LZMADecompressor, Shared.ArcFour, Shared.SetupEntFunc, Setup.SelectLanguageForm,
Setup.WizardForm, Setup.DebugClient, Shared.VerInfoFunc, Setup.FileExtractor, Shared.FileClass, Setup.LoggingFunc, MD5, SHA1, ActiveX,
- Shared.SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,
+ SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,
Shared.TaskDialogFunc, RegStr;
{$R *.DFM}
diff --git a/Projects/Src/Setup.NewDiskForm.pas b/Projects/Src/Setup.NewDiskForm.pas
index c45827cf5..99869f81a 100644
--- a/Projects/Src/Setup.NewDiskForm.pas
+++ b/Projects/Src/Setup.NewDiskForm.pas
@@ -40,7 +40,7 @@ function SelectDisk(const DiskNumber: Integer; const AFilename: String; var Path
implementation
uses
- Setup.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc,
+ Setup.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc,
Setup.MainForm, Setup.WizardForm;
{$R *.DFM}
diff --git a/Projects/Src/Setup.ScriptClasses.pas b/Projects/Src/Setup.ScriptClasses.pas
index 33243a4cb..baf7fff35 100644
--- a/Projects/Src/Setup.ScriptClasses.pas
+++ b/Projects/Src/Setup.ScriptClasses.pas
@@ -24,7 +24,7 @@ implementation
uPSR_std, uPSR_classes, uPSR_graphics, uPSR_controls, uPSR_forms,
uPSR_stdctrls, uPSR_extctrls, uPSR_comobj,
NewStaticText, NewCheckListBox, NewProgressBar, RichEditViewer,
- ExtCtrls, Shared.UIStateForm, Setup.SetupForm, Setup.MainForm, Setup.WizardForm, Shared.SetupTypes, PasswordEdit,
+ ExtCtrls, UIStateForm, Setup.SetupForm, Setup.MainForm, Setup.WizardForm, Shared.SetupTypes, PasswordEdit,
FolderTreeView, BitmapImage, NewNotebook, Setup.ScriptDlg, BidiCtrls,
Setup.UninstallProgressForm;
diff --git a/Projects/Src/Setup.ScriptDlg.pas b/Projects/Src/Setup.ScriptDlg.pas
index cac1dedc6..b04950b83 100644
--- a/Projects/Src/Setup.ScriptDlg.pas
+++ b/Projects/Src/Setup.ScriptDlg.pas
@@ -15,7 +15,7 @@ interface
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls, Contnrs,
Setup.WizardForm, Setup.Install,
NewCheckListBox, NewStaticText, NewProgressBar, PasswordEdit, RichEditViewer,
- BidiCtrls, Shared.TaskbarProgressFunc;
+ BidiCtrls, TaskbarProgressFunc;
type
TInputQueryWizardPage = class(TWizardPage)
@@ -203,7 +203,7 @@ implementation
StrUtils,
Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Setup.Messages,
Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
- Shared.BrowseFunc, Setup.LoggingFunc, Setup.InstFunc;
+ BrowseFunc, Setup.LoggingFunc, Setup.InstFunc;
const
DefaultLabelHeight = 14;
diff --git a/Projects/Src/Setup.ScriptFunc.pas b/Projects/Src/Setup.ScriptFunc.pas
index 9d2526b18..4f443713b 100644
--- a/Projects/Src/Setup.ScriptFunc.pas
+++ b/Projects/Src/Setup.ScriptFunc.pas
@@ -24,7 +24,7 @@ implementation
Shared.Struct, Setup.ScriptDlg, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl,
Shared.CommonFunc, Shared.FileClass, Setup.RedirFunc,
Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.Messages,
- Shared.SetupMessageIDs, Setup.NewDiskForm, Shared.BrowseFunc, Setup.WizardForm, Shared.VerInfoFunc,
+ Shared.SetupMessageIDs, Setup.NewDiskForm, BrowseFunc, Setup.WizardForm, Shared.VerInfoFunc,
Shared.SetupTypes, Shared.Int64Em, MD5, SHA1, Setup.LoggingFunc, Setup.SetupForm, Setup.RegDLL, Setup.Helper,
Setup.SpawnClient, Setup.UninstallProgressForm, ASMInline, Setup.DotNetFunc,
Shared.DotNetVersion, Setup.MsiFunc, BitmapImage;
diff --git a/Projects/Src/Setup.SetupForm.pas b/Projects/Src/Setup.SetupForm.pas
index b87653aec..0f7d0b194 100644
--- a/Projects/Src/Setup.SetupForm.pas
+++ b/Projects/Src/Setup.SetupForm.pas
@@ -13,7 +13,7 @@ interface
uses
Windows, SysUtils, Messages, Classes, Graphics, Controls, Forms, Dialogs,
- Shared.UIStateForm, Shared.SetupMessageIDs;
+ UIStateForm, Shared.SetupMessageIDs;
type
TSetupForm = class(TUIStateForm)
diff --git a/Projects/Src/Setup.UninstallProgressForm.pas b/Projects/Src/Setup.UninstallProgressForm.pas
index 3aee93e7d..0f3ecafc5 100644
--- a/Projects/Src/Setup.UninstallProgressForm.pas
+++ b/Projects/Src/Setup.UninstallProgressForm.pas
@@ -65,7 +65,7 @@ TUninstallProgressForm = class(TSetupForm)
implementation
uses
- Shared.TaskbarProgressFunc, Setup.MainForm, Setup.Messages,
+ TaskbarProgressFunc, Setup.MainForm, Setup.Messages,
Shared.SetupMessageIDs, Shared.CommonFunc.Vcl;
{$R *.DFM}