Changeset 227 for trunk/Forms/FormExport.pas

Timestamp:

Jan 20, 2025, 11:38:55 AM (42 hours ago)

Author:

chronos

Message:

• Modified: Do not reference global Core object if possible.

File:

• trunk/Forms/FormExport.pas (modified) (8 diffs)

trunk/Forms/FormExport.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  JobProgressView, FormEx;
+  JobProgressView, FormEx, Acronym;
 
 type
@@ -15 +15 @@
     ButtonSaveToFile: TButton;
     ComboBoxDataFormat: TComboBox;
+    JobProgressView1: TJobProgressView;
     Label1: TLabel;
     Memo1: TMemo;
@@ -26 +27 @@
     procedure JobExportMediaWiki(Job: TJob);
     procedure JobExportMediaWikiTable(Job: TJob);
+  public
+    AcronymDb: TAcronymDb;
   end;
 
@@ -32 +35 @@
 
 {$R *.lfm}
-
-uses
-  Core, Acronym;
 
 resourcestring
@@ -57 +57 @@
   J: Integer;
 begin
-  Job.Progress.Max := Core.Core.AcronymDb.Acronyms.Count;
+  Job.Progress.Max := AcronymDb.Acronyms.Count;
   ItemCount := 0;
   Content := '';
-  for I := 0 to Core.Core.AcronymDb.Acronyms.Count - 1 do
-  with Core.Core.AcronymDb.Acronyms[I] do begin
+  for I := 0 to AcronymDb.Acronyms.Count - 1 do
+  with AcronymDb.Acronyms[I] do begin
     for J := 0 to Meanings.Count - 1 do
     with Meanings[J] do begin
@@ -77 +77 @@
   J: Integer;
 begin
-  Job.Progress.Max := Core.Core.AcronymDb.Acronyms.Count;
+  Job.Progress.Max := AcronymDb.Acronyms.Count;
   ItemCount := 0;
   Content := '';
-  for I := 0 to Core.Core.AcronymDb.Acronyms.Count - 1 do
-  with Core.Core.AcronymDb.Acronyms[I] do begin
+  for I := 0 to AcronymDb.Acronyms.Count - 1 do
+  with AcronymDb.Acronyms[I] do begin
     Content := Content + '; ' + Name + LineEnding;
     for J := 0 to Meanings.Count - 1 do
@@ -98 +98 @@
   J: Integer;
 begin
-  Job.Progress.Max := Core.Core.AcronymDb.Acronyms.Count;
+  Job.Progress.Max := AcronymDb.Acronyms.Count;
   ItemCount := 0;
   Content := '{| class="wikitable sortable"' + LineEnding +
     '! Name !! Meaning !! Description !! Categories' + LineEnding;
-  for I := 0 to Core.Core.AcronymDb.Acronyms.Count - 1 do
-  with Core.Core.AcronymDb.Acronyms[I] do begin
+  for I := 0 to AcronymDb.Acronyms.Count - 1 do
+  with AcronymDb.Acronyms[I] do begin
     for J := 0 to Meanings.Count - 1 do
     with Meanings[J] do begin
@@ -120 +120 @@
 begin
   if ComboBoxDataFormat.ItemIndex = 0 then
-    Core.Core.JobProgressView1.AddJob(SExporting, JobExportCSV);
+    JobProgressView1.AddJob(SExporting, JobExportCSV);
   if ComboBoxDataFormat.ItemIndex = 1 then
-    Core.Core.JobProgressView1.AddJob(SExporting, JobExportMediaWiki);
+    JobProgressView1.AddJob(SExporting, JobExportMediaWiki);
   if ComboBoxDataFormat.ItemIndex = 2 then
-    Core.Core.JobProgressView1.AddJob(SExporting, JobExportMediaWikiTable);
-  Core.Core.JobProgressView1.Start;
+    JobProgressView1.AddJob(SExporting, JobExportMediaWikiTable);
+  JobProgressView1.Start;
   Memo1.Lines.Text := Content;
   ShowMessage(Format(SExportedAcronyms, [ItemCount]));