GikoSysのFAbonをpublicに変更したので、Abonizerを削除

diff --git a/Giko.pas b/Giko.pas
index 8589143..946ebed 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -18,8 +18,7 @@ uses
        GikoSystem, GikoUtil, Setting, BoardGroup, ThreadControl, ItemDownload,
        Editor, RoundData, RoundName, KeySetting, GikoPanel, Favorite, FavoriteAdd,
        FavoriteArrange, AddressHistory, Preview, HTMLDocumentEvent, Kotehan,
-       HintWindow, GikoCoolBar, GikoListView, ToolBarSetting, ToolBarUtil,
-        AbonUnit;
+       HintWindow, GikoCoolBar, GikoListView, ToolBarSetting, ToolBarUtil;
 
 type
        TGikoTreeType = (gttNone, gtt2ch, gttHistory);
@@ -5908,7 +5907,7 @@ var
        Header: string;
        Body: string;
 
-        Abonizer : TAbon;
+        //Abonizer : TAbon;
 begin
        try
                if StNum > ToNum then begin
@@ -5934,16 +5933,12 @@ begin
                                end;
                        end;
 
-                        Abonizer := TAbon.Create;
-                        Abonizer.Setroot( GikoSys.GetAppDir );
-                        Abonizer.SetNGwordpath( 'NGword.txt' );
-
                        for i := StNum to ToNum do begin
                                Line := i;
                                FileName := IncludeTrailingPathDelimiter(BBS2ch.GetLogFolder + sBoard) + sThread + '.dat';
                                tmp := GikoSys.ReadThreadFile(FileName, Line);
 
-                               if (tmp <> '') And (Not Abonizer.FindNGwords( tmp )) then begin
+                               if (tmp <> '') And ( not GikoSys.FAbon.CheckAbonPopupRes(tmp)) then begin
                                        Res := GikoSys.DivideStrLine(tmp);
 
                                        Header := IntToStr(Line) + ' \96¼\91O\81F ' + Res.FName + ' \93\8a\8de\93ú\81F ' + Res.FDateTime;
@@ -5961,8 +5956,6 @@ begin
 //                                                     s := StringReplace(s, '\81\97\81M', ',', [rfReplaceAll]);
                                end;
                        end;
-
-                        Abonizer.Destroy;
                end;
        finally
        end;
@@ -6600,13 +6593,13 @@ end;
 //NG\83\8f\81[\83h\83t\83@\83C\83\8b\82ð\95Ò\8fW\82·\82é\82½\82ß\82É\8aJ\82­
 procedure TGikoForm.NG1Click(Sender: TObject);
 begin
-    GikoSys.OpenNGwordFile;
+    GikoSys.FAbon.EditNGwords;
 end;
 //NG\83\8f\81[\83h\83t\83@\83C\83\8b\82ð\8dÄ\93Ç\82Ý\8d\9e\82Ý\82·\82é
 procedure TGikoForm.NG2Click(Sender: TObject);
 
 begin
-    if GikoSys.ReloadNGwordFile =false then begin
+    if GikoSys.FAbon.ReLoadFromNGwordFile =false then begin
                MsgBox(Handle, 'NG\83\8f\81[\83h\83t\83@\83C\83\8b\82Ì\8dÄ\93Ç\82Ý\8d\9e\82Ý\82É\8e¸\94s\82µ\82Ü\82µ\82½', '\83G\83\89\81[', MB_OK or MB_ICONEXCLAMATION);
     end else begin
         //\82±\82±\82Å\8c»\8dÝ\95\\8e¦\82³\82ê\82Ä\82¢\82é\83X\83\8c\83b\83h\82Ì\8dÄ\95`\89æ\82ð\8cÄ\82Ñ\8fo\82µ\82½\82¢\82ª\82â\82è\95û\95ª\82©\82ç\82¸¥¥¥\81B