Renamed Web.UInfo unit as UUrl and TWebInfo as TURL.

Changed all affected units.

Author: delphidabbler

Src/CodeSnip.dpr

@@ -356,6 +356,7 @@ uses
   UUnitAnalyser in 'UUnitAnalyser.pas',
   UUnitsChkListMgr in 'UUnitsChkListMgr.pas',
   UURIEncode in 'UURIEncode.pas',
+  UUrl in 'UUrl.pas',
   UUrlMonEx in 'UUrlMonEx.pas',
   UUserDBBackup in 'UUserDBBackup.pas',
   UUserDBMgr in 'UUserDBMgr.pas',
@@ -375,8 +376,7 @@ uses
   UWindowSettings in 'UWindowSettings.pas',
   UXMLDocConsts in 'UXMLDocConsts.pas',
   UXMLDocHelper in 'UXMLDocHelper.pas',
-  UXMLDocumentEx in 'UXMLDocumentEx.pas',
-  Web.UInfo in 'Web.UInfo.pas';
+  UXMLDocumentEx in 'UXMLDocumentEx.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file

Src/CodeSnip.dproj

@@ -557,6 +557,7 @@
 			<DCCReference Include="UUnitAnalyser.pas"/>
 			<DCCReference Include="UUnitsChkListMgr.pas"/>
 			<DCCReference Include="UURIEncode.pas"/>
+			<DCCReference Include="UUrl.pas"/>
 			<DCCReference Include="UUrlMonEx.pas"/>
 			<DCCReference Include="UUserDBBackup.pas"/>
 			<DCCReference Include="UUserDBMgr.pas"/>
@@ -577,7 +578,6 @@
 			<DCCReference Include="UXMLDocConsts.pas"/>
 			<DCCReference Include="UXMLDocHelper.pas"/>
 			<DCCReference Include="UXMLDocumentEx.pas"/>
-			<DCCReference Include="Web.UInfo.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

Src/FmBugReportBaseDlg.pas

@@ -55,7 +55,7 @@ implementation
   // Delphi
   ExtActns,
   // Project
-  UColours, UCtrlArranger, UFontHelper, Web.UInfo;
+  UColours, UCtrlArranger, UFontHelper, UUrl;
 
 
 {$R *.dfm}
@@ -100,7 +100,7 @@ procedure TBugReportBaseDlg.GoToTracker;
   // must be able to override this method.
   with TBrowseURL.Create(nil) do
     try
-      URL := TWebInfo.BugTrackerURL;
+      URL := TURL.BugTrackerURL;
       Execute;
     finally
       Free;

Src/FmDBUpdateDlg.pas

@@ -173,7 +173,7 @@ implementation
   UMessageBox,
   UStructs,
   UStrUtils,
-  Web.UInfo;
+  UUrl;
 
 {$R *.dfm}
 
@@ -272,7 +272,7 @@ procedure TDBUpdateDlg.ConfigForm;
     begin
       Tplt.ResolvePlaceholderText(
         'CSDBReleaseURL',
-        TWebInfo.CSDBReleaseURL
+        TURL.CSDBReleaseURL
       );
     end
   );

Src/FmMain.pas

@@ -574,8 +574,8 @@ implementation
   UCopySourceMgr, UDatabaseLoader, UDatabaseLoaderUI, UDetailTabAction,
   UEditSnippetAction, UExceptions, UHelpMgr, UHistoryMenus, UKeysHelper,
   UMessageBox, UNotifier, UNulDropTarget, UPrintMgr, UQuery, USaveSnippetMgr,
-  USaveUnitMgr, USelectionIOMgr, UShowPrefsPageAction, UUserDBMgr, UView,
-  UViewItemAction, UWBExternal, Web.UInfo;
+  USaveUnitMgr, USelectionIOMgr, UShowPrefsPageAction, UUrl, UUserDBMgr, UView,
+  UViewItemAction, UWBExternal;
 
 
 {$R *.dfm}
@@ -1337,9 +1337,9 @@ procedure TMainForm.InitForm;
 
     // Initialise actions
     // Browse actions have to have URLs set dynamically
-    actGitHubHome.URL := TWebInfo.GitHubURL;
-    actFAQs.URL := TWebInfo.FAQsURL;
-    actBlog.URL := TWebInfo.BlogURL;
+    actGitHubHome.URL := TURL.GitHubURL;
+    actFAQs.URL := TURL.FAQsURL;
+    actBlog.URL := TURL.BlogURL;
     // Tree control actions need shortcuts adding dynamically, and state stored
     // in Tag property
     actExpandNode.ShortCut := ShortCut(VK_ADD, [ssCtrl]);

Src/FmSWAGImportDlg.pas

@@ -260,8 +260,8 @@ implementation
   UHTMLTemplate,
   UMessageBox,
   UStrUtils,
-  UWaitForThreadUI,
-  Web.UInfo;
+  UUrl,
+  UWaitForThreadUI;
 
 {$R *.dfm}
 
@@ -482,7 +482,7 @@ procedure TSWAGImportDlg.ConfigForm;
     begin
       Tplt.ResolvePlaceholderText(
         'SWAGReleaseURL',
-        TWebInfo.SWAGReleaseURL
+        TURL.SWAGReleaseURL
       );
     end
   );

Src/UPaypalDonateAction.pas

@@ -44,7 +44,7 @@ implementation
   // Delphi
   SysUtils, ExtActns,
   // Project
-  Web.UInfo;
+  UUrl;
 
 
 { TPaypalDonateAction }
@@ -61,7 +61,7 @@ function TPaypalDonateAction.Execute: Boolean;
   // use a TBrowseAction to access URL
   BrowseAction := TBrowseURL.Create(nil);
   try
-    BrowseAction.URL := TWebInfo.DonateURL;
+    BrowseAction.URL := TURL.DonateURL;
     BrowseAction.Execute;
   finally
     FreeAndNil(BrowseAction);

Src/USaveUnitMgr.pas

@@ -96,7 +96,7 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  UAppInfo, UUtils, Web.UInfo;
+  UAppInfo, UUrl, UUtils;
 
 // TODO -cDatabase: get license info from database rather than use literal text.
 
@@ -150,7 +150,7 @@ function TSaveUnitMgr.CreateHeaderComments: IStringList;
     // Result used for units that contain at snippet(s) from main database
     Result.Add(Format(sLicense, [FormatDateTime('YYYY', Now)]));
     Result.Add('');
-    Result.Add(Format(sMainDescription, [TWebInfo.DatabaseURL]));
+    Result.Add(Format(sMainDescription, [TURL.DatabaseURL]));
     Result.Add('');
     Result.Add(Format(sGenerated, [RFC1123DateStamp]));
     Result.Add(
@@ -160,7 +160,7 @@ function TSaveUnitMgr.CreateHeaderComments: IStringList;
     );
     Result.Add('');
     Result.Add(
-      Format(sAdvert, [TAppInfo.ProgramName, TWebInfo.GitHubURL])
+      Format(sAdvert, [TAppInfo.ProgramName, TURL.GitHubURL])
     );
   end
   else

Src/USnippetDoc.pas

@@ -111,7 +111,7 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  Compilers.UCompilers, DB.UMain, DB.USnippetKind, UStrUtils, Web.UInfo;
+  Compilers.UCompilers, DB.UMain, DB.USnippetKind, UStrUtils, UUrl;
 
 
 { TSnippetDoc }
@@ -180,7 +180,7 @@ function TSnippetDoc.Generate(const Snippet: TSnippet): TEncodedData;
     RenderExtra(Snippet.Extra);
   if not Snippet.UserDefined then
     // database info written only if snippet is from main database
-    RenderDBInfo(Format(sMainDatabaseInfo, [TWebInfo.DatabaseURL]));
+    RenderDBInfo(Format(sMainDatabaseInfo, [TURL.DatabaseURL]));
   Result := FinaliseDoc;
 end;
 

Src/Web.UInfo.pas renamed to Src/UUrl.pas

@@ -10,21 +10,16 @@
 }
 
 
-unit Web.UInfo;
+unit UUrl;
 
 
 interface
 
 
-uses
-  // Project
-  UBaseObjects;
-
-
 type
-  ///  <summary>Static class that provides information about URLs and any proxy
-  ///  server used by CodeSnip.</summary>
-  TWebInfo = class(TNoConstructObject)
+  ///  <summary>Advanced record that provides various URLs used by the program.
+  ///  </summary>
+  TURL = record
   strict private
     const
       ///  <summary>Name of server that hosts tested and released web services