Changeset 227 for trunk/Forms/FormImport.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/FormImport.pas (modified) (6 diffs)

trunk/Forms/FormImport.pas

@@ -23 +23 @@
     procedure ImportMediaWiki;
     procedure ImportCSV;
+  public
+    AcronymDb: TAcronymDb;
   end;
 
@@ -29 +31 @@
 
 {$R *.lfm}
-
-uses
-  Core;
 
 resourcestring
@@ -75 +74 @@
       AcronymMeaning := Trim(Copy(Line, 2, Length(Line)));
       if (AcronymName <> '') and (AcronymMeaning <> '') then begin
-        Acronym := Core.Core.AcronymDb.Acronyms.SearchByName(AcronymName);
+        Acronym := AcronymDb.Acronyms.SearchByName(AcronymName);
         if not Assigned(Acronym) then begin
           Acronym := TAcronym.Create;
           Acronym.Name := AcronymName;
-          Core.Core.AcronymDb.Acronyms.Add(Acronym);
+          AcronymDb.Acronyms.Add(Acronym);
         end;
         Meaning := Acronym.Meanings.SearchByName(AcronymMeaning);
@@ -92 +91 @@
     end;
   end;
-  if AddedCount > 0 then Core.Core.AcronymDb.Modified := True;
+  if AddedCount > 0 then AcronymDb.Modified := True;
   ShowMessage(Format(SImportedNewAcronyms, [AddedCount]));
 end;
@@ -121 +120 @@
       else AcronymDescription := '';
     if (AcronymName <> '') and (AcronymDescription <> '') then begin
-      Acronym := Core.Core.AcronymDb.Acronyms.SearchByName(AcronymName);
+      Acronym := AcronymDb.Acronyms.SearchByName(AcronymName);
       if not Assigned(Acronym) then begin
         Acronym := TAcronym.Create;
         Acronym.Name := AcronymName;
-        Core.Core.AcronymDb.Acronyms.Add(Acronym);
+        AcronymDb.Acronyms.Add(Acronym);
       end;
       Meaning := Acronym.Meanings.SearchByName(AcronymDescription);
@@ -139 +138 @@
   end;
   Columns.Free;
-  if AddedCount > 0 then Core.Core.AcronymDb.Modified := True;
+  if AddedCount > 0 then AcronymDb.Modified := True;
   ShowMessage(Format(SImportedNewAcronyms, [AddedCount]));
 end;