2 renames in Components.

Components/NewCheckListBox.pas

@@ -205,7 +205,7 @@ procedure Register;
 implementation
 
 uses
-  TmSchema, PathFunc, ActiveX, BidiUtils, Types;
+  NewUxTheme.TmSchema, PathFunc, ActiveX, BidiUtils, Types;
 
 const
   sRadioCantHaveDisabledChildren = 'Radio item cannot have disabled child items';

Components/TmSchema.pas → Components/NewUxTheme.TmSchema.pas

@@ -46,7 +46,7 @@
 
 { Simplified by Martijn Laan for Inno Setup }
 
-unit TmSchema;
+unit NewUxTheme.TmSchema;
 
 interface
 

Components/IsscintInt.pas → Components/ScintInt.InnoSetup.pas

@@ -1,4 +1,4 @@
-unit IsscintInt;
+unit ScintInt.InnoSetup;
 
 {
   Inno Setup

Projects/Compil32.dpr

@@ -26,7 +26,7 @@ uses
   IDE.Wizard.WizardForm in 'Src\Compil32\IDE.Wizard.WizardForm.pas' {WizardForm},
   IDE.Wizard.WizardFileForm in 'Src\Compil32\IDE.Wizard.WizardFileForm.pas' {WizardFileForm},
   IDE.FileAssocFunc in 'Src\Compil32\IDE.FileAssocFunc.pas',
-  TmSchema in '..\Components\TmSchema.pas',
+  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',
@@ -61,7 +61,7 @@ uses
   IDE.RegistryDesignerForm in 'Src\Compil32\IDE.RegistryDesignerForm.pas' {RegistryDesignerForm},
   IDE.Wizard.WizardFormRegistryHelper in 'Src\Compil32\IDE.Wizard.WizardFormRegistryHelper.pas',
   MD5 in '..\Components\MD5.pas',
-  IsscintInt in '..\Components\IsscintInt.pas',
+  ScintInt.InnoSetup in '..\Components\ScintInt.InnoSetup.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',

Projects/Compil32.dproj

@@ -98,7 +98,7 @@
             <Form>WizardFileForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Compil32\IDE.FileAssocFunc.pas"/>
-        <DCCReference Include="..\Components\TmSchema.pas"/>
+        <DCCReference Include="..\Components\NewUxTheme.TmSchema.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <DCCReference Include="Src\Shared.DebugStruct.pas"/>
         <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
@@ -141,7 +141,7 @@
         </DCCReference>
         <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFormRegistryHelper.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
-        <DCCReference Include="..\Components\IsscintInt.pas"/>
+        <DCCReference Include="..\Components\ScintInt.InnoSetup.pas"/>
         <DCCReference Include="Src\Shared.ScriptFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>

Projects/Setup.dpr

@@ -78,7 +78,7 @@ uses
   NewProgressBar in '..\Components\NewProgressBar.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
   PasswordEdit in '..\Components\PasswordEdit.pas',
-  TmSchema in '..\Components\TmSchema.pas',
+  NewUxTheme.TmSchema in '..\Components\NewUxTheme.TmSchema.pas',
   RestartManager in '..\Components\RestartManager.pas',
   Resample in '..\Components\Resample.pas',
   ASMInline in '..\Components\ASMInline.pas',

Projects/Setup.dproj

@@ -151,7 +151,7 @@
         <DCCReference Include="..\Components\NewProgressBar.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
         <DCCReference Include="..\Components\PasswordEdit.pas"/>
-        <DCCReference Include="..\Components\TmSchema.pas"/>
+        <DCCReference Include="..\Components\NewUxTheme.TmSchema.pas"/>
         <DCCReference Include="..\Components\RestartManager.pas"/>
         <DCCReference Include="..\Components\Resample.pas"/>
         <DCCReference Include="..\Components\ASMInline.pas"/>

Projects/Src/Compil32/IDE.CompScintEdit.pas

@@ -171,7 +171,7 @@ type
 implementation
 
 uses
-  SysUtils, MD5, IsscintInt;
+  SysUtils, MD5, ScintInt.InnoSetup;
   
 { TCompScintEdit }
 

Projects/Src/Compil32/IDE.CompileForm.pas

@@ -651,7 +651,7 @@ implementation
 uses
   ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes,
   Math, StrUtils, WideStrUtils,
-  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, TmSchema, Shared.BrowseFunc,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, Shared.BrowseFunc,
   IDE.HtmlHelpFunc, Shared.TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
   IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm,