Refactor out all with statements.

Fixes #118

Author: delphidabbler

Src/DB.UMain.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a singleton object and subsidiary classes that encapsulate the
  * snippets and categories in the CodeSnip database and user defined databases.
@@ -954,11 +954,9 @@ procedure TDatabase.Load;
   try
     // Load main database: MUST do this first since user database can
     // reference objects in main database
-    with TDatabaseIOFactory.CreateMainDBLoader do
-      Load(fSnippets, fCategories, Factory);
+    TDatabaseIOFactory.CreateMainDBLoader.Load(fSnippets, fCategories, Factory);
     // Load any user database
-    with TDatabaseIOFactory.CreateUserDBLoader do
-      Load(fSnippets, fCategories, Factory);
+    TDatabaseIOFactory.CreateUserDBLoader.Load(fSnippets, fCategories, Factory);
     fUpdated := False;
   except
     // If an exception occurs clear the database
@@ -984,8 +982,7 @@ procedure TDatabase.Save;
   // Create object that can provide required information about user database
   Provider := TUserDataProvider.Create(fSnippets, fCategories);
   // Use a writer object to write out the database
-  with TDatabaseIOFactory.CreateWriter do
-    Write(fSnippets, fCategories, Provider);
+  TDatabaseIOFactory.CreateWriter.Write(fSnippets, fCategories, Provider);
   fUpdated := False;
 end;
 

Src/FirstRun.FmV4ConfigDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that may be displayed on the first run of
  * CodeSnip v4 to get user to decide whether what data to bring forward from
@@ -289,14 +289,16 @@ function TV4ConfigDlg.DatabaseAvailable: Boolean;
 
 class procedure TV4ConfigDlg.Execute(AOwner: TComponent;
   const FirstRun: TFirstRun);
+var
+  Dlg: TV4ConfigDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fFirstRun := FirstRun;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fFirstRun := FirstRun;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TV4ConfigDlg.FormCloseQuery(Sender: TObject; var CanClose: Boolean);

Src/FirstRun.FmWhatsNew.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2020-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2020-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements dialogue box that may be displayed the first time CodeSnip 4.x.x
  * is run after an update. The dialogue box displays a HTML page that draws
@@ -114,13 +114,15 @@ procedure TWhatsNewDlg.CreateParams(var Params: TCreateParams);
 end;
 
 class procedure TWhatsNewDlg.Execute(AOwner: TComponent);
+var
+  Dlg: TWhatsNewDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 function TWhatsNewDlg.GetAligner: IFormAligner;

Src/FmAboutDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements the program's About dialogue box.
 }
@@ -326,13 +326,15 @@ function TAboutDlg.ContribListHTML(ContribList: IStringList):
 end;
 
 class procedure TAboutDlg.Execute(AOwner: TComponent);
+var
+  Dlg: TAboutDlg;
 begin
-  with Create(AOwner) do
-    try
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := Create(AOwner);
+  try
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TAboutDlg.FormCreate(Sender: TObject);

Src/FmActiveTextPreviewDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays active text rendered from REML markup
  * or plain text.
@@ -143,14 +143,16 @@ class procedure TActiveTextPreviewDlg.Execute(const AOwner: TComponent;
     @param AOwner [in] Component that owns this dialog box.
     @param ActiveText [in] Active text to be displayed as HTML.
   }
+var
+  Dlg: TActiveTextPreviewDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fActiveText := ActiveText;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fActiveText := ActiveText;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TActiveTextPreviewDlg.HTMLEventHandler(Sender: TObject;
@@ -162,6 +164,7 @@ procedure TActiveTextPreviewDlg.HTMLEventHandler(Sender: TObject;
   }
 var
   ALink: IDispatch;   // reference to the any link that was clicked
+  ProtocolHander: TProtocol;
 resourcestring
   // Button captions for choice dialog box
   sClose = 'Close';
@@ -195,12 +198,12 @@ procedure TActiveTextPreviewDlg.HTMLEventHandler(Sender: TObject;
     ) = cViewLinkRes then
     begin
       // User wants to view link: use protocol handler to display it
-      with TProtocolFactory.CreateHandler(TAnchors.GetURL(ALink)) do
-        try
-          Execute;
-        finally
-          Free;
-        end;
+      ProtocolHander := TProtocolFactory.CreateHandler(TAnchors.GetURL(ALink));
+      try
+        ProtocolHander.Execute;
+      finally
+        ProtocolHander.Free;
+      end;
     end;
   end;
 end;

Src/FmAddCategoryDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that permits user to add a new user defined
  * category to the database.
@@ -133,13 +133,15 @@ class function TAddCategoryDlg.Execute(AOwner: TComponent): Boolean;
     @param AOwner [in] Component that owns dialog box.
     @param CatList [in] List of categories available for deletion.
   }
+var
+  Dlg: TAddCategoryDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TAddCategoryDlg.UpdateOKBtn;

Src/FmBugReportBaseDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a base class and common functionality for bug report dialogue boxes.
 }
@@ -95,16 +95,18 @@ procedure TBugReportBaseDlg.GoToTracker;
   {Displays online bug tracker. Descendants should override to add extra
   functionality.
   }
+var
+  BrowseAction: TBrowseURL;
 begin
   // NOTE: Don't change actBugTracker to TBrowseURL and delete this. Subclasses
   // must be able to override this method.
-  with TBrowseURL.Create(nil) do
-    try
-      URL := TURL.CodeSnipBugTracker;
-      Execute;
-    finally
-      Free;
-    end;
+  BrowseAction := TBrowseURL.Create(nil);
+  try
+    BrowseAction.URL := TURL.CodeSnipBugTracker;
+    BrowseAction.Execute;
+  finally
+    BrowseAction.Free;
+  end;
 end;
 
 procedure TBugReportBaseDlg.lblBugTrackerClick(Sender: TObject);

Src/FmCodeExportDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that gets snippets to be exported and creates an
  * export file containing the selected snippets.
@@ -189,14 +189,16 @@ class procedure TCodeExportDlg.Execute(const AOwner: TComponent;
     @param Snippet [in] Reference to a snippet to pre-select in snippets check
       list box. If nil or not user-defined then no snippet is pre-selected.
   }
+var
+  Dlg: TCodeExportDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      SelectSnippet(Snippet);
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.SelectSnippet(Snippet);
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TCodeExportDlg.SelectSnippet(const Snippet: TSnippet);

Src/FmCodeImportDlg.pas

@@ -1,9 +1,9 @@
-{
+{
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that handles the import of user defined
  * snippets into the database. Permits snippets from the import file to be
@@ -296,13 +296,15 @@ function TCodeImportDlg.CountImportSnippets: Integer;
 
 class function TCodeImportDlg.Execute(AOwner: TComponent;
   const ImportMgr: TCodeImportMgr): Boolean;
+var
+  Dlg: TCodeImportDlg;
 begin
-  with InternalCreate(AOwner, ImportMgr) do
-    try
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner, ImportMgr);
+  try
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 function TCodeImportDlg.GetFileNameFromEditCtrl: string;

Src/FmCompErrorDlg.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays compiler error and warning logs.
 }
@@ -180,18 +180,19 @@ class procedure TCompErrorDlg.Execute(const AOwner: TComponent;
   const ASnippet: TSnippet; const ACompilers: ICompilers);
 var
   Compiler: ICompiler;  // each supported compiler
+  Dlg: TCompErrorDlg;
 begin
   Assert(Assigned(ACompilers), ClassName + '.Execute: ACompilers is nil');
-  with InternalCreate(AOwner) do
-    try
-      fSnippet := ASnippet;
-      for Compiler in ACompilers do
-        if Compiler.HasErrorsOrWarnings then
-          fRequiredCompilers.Add(Compiler);
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fSnippet := ASnippet;
+    for Compiler in ACompilers do
+      if Compiler.HasErrorsOrWarnings then
+        Dlg.fRequiredCompilers.Add(Compiler);
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TCompErrorDlg.FormCreate(Sender: TObject);