GetCountPanelに対する設定値の設定・取得を LoadConfing/SaveConfig メソッドに移動

[opentween/open-tween.git] / OpenTween / Twitter.cs

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 7f6fba2..1aaf4a7 100644 (file)
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -1377,17 +1377,17 @@ namespace OpenTween
 
             HttpStatusCode res;
             var content = "";
-            var count = AppendSettingDialog.Instance.CountApi;
-            if (gType == MyCommon.WORKERTYPE.Reply) count = AppendSettingDialog.Instance.CountApiReply;
-            if (AppendSettingDialog.Instance.UseAdditionalCount)
+            var count = SettingCommon.Instance.CountApi;
+            if (gType == MyCommon.WORKERTYPE.Reply) count = SettingCommon.Instance.CountApiReply;
+            if (SettingCommon.Instance.UseAdditionalCount)
             {
-                if (more && AppendSettingDialog.Instance.MoreCountApi != 0)
+                if (more && SettingCommon.Instance.MoreCountApi != 0)
                 {
-                    count = AppendSettingDialog.Instance.MoreCountApi;
+                    count = SettingCommon.Instance.MoreCountApi;
                 }
-                else if (startup && AppendSettingDialog.Instance.FirstCountApi != 0 && gType == MyCommon.WORKERTYPE.Timeline)
+                else if (startup && SettingCommon.Instance.FirstCountApi != 0 && gType == MyCommon.WORKERTYPE.Timeline)
                 {
-                    count = AppendSettingDialog.Instance.FirstCountApi;
+                    count = SettingCommon.Instance.FirstCountApi;
                 }
             }
             try
@@ -1797,28 +1797,28 @@ namespace OpenTween
             HttpStatusCode res;
             var content = "";
             int count;
-            if (AppendSettingDialog.Instance.UseAdditionalCount)
+            if (SettingCommon.Instance.UseAdditionalCount)
             {
-                count = AppendSettingDialog.Instance.ListCountApi;
+                count = SettingCommon.Instance.ListCountApi;
                 if (count == 0)
                 {
-                    if (more && AppendSettingDialog.Instance.MoreCountApi != 0)
+                    if (more && SettingCommon.Instance.MoreCountApi != 0)
                     {
-                        count = AppendSettingDialog.Instance.MoreCountApi;
+                        count = SettingCommon.Instance.MoreCountApi;
                     }
-                    else if (startup && AppendSettingDialog.Instance.FirstCountApi != 0)
+                    else if (startup && SettingCommon.Instance.FirstCountApi != 0)
                     {
-                        count = AppendSettingDialog.Instance.FirstCountApi;
+                        count = SettingCommon.Instance.FirstCountApi;
                     }
                     else
                     {
-                        count = AppendSettingDialog.Instance.CountApi;
+                        count = SettingCommon.Instance.CountApi;
                     }
                 }
             }
             else
             {
-                count = AppendSettingDialog.Instance.CountApi;
+                count = SettingCommon.Instance.CountApi;
             }
             try
             {
@@ -1963,14 +1963,14 @@ namespace OpenTween
             long? maxId = null;
             long? sinceId = null;
             var count = 100;
-            if (AppendSettingDialog.Instance.UseAdditionalCount &&
-                AppendSettingDialog.Instance.SearchCountApi != 0)
+            if (SettingCommon.Instance.UseAdditionalCount &&
+                SettingCommon.Instance.SearchCountApi != 0)
             {
-                count = AppendSettingDialog.Instance.SearchCountApi;
+                count = SettingCommon.Instance.SearchCountApi;
             }
             else
             {
-                count = AppendSettingDialog.Instance.CountApi;
+                count = SettingCommon.Instance.CountApi;
             }
             if (more)
             {
@@ -2189,11 +2189,11 @@ namespace OpenTween
 
             if (MyCommon._endingFlag) return "";
 
-            var count = AppendSettingDialog.Instance.CountApi;
-            if (AppendSettingDialog.Instance.UseAdditionalCount &&
-                AppendSettingDialog.Instance.FavoritesCountApi != 0)
+            var count = SettingCommon.Instance.CountApi;
+            if (SettingCommon.Instance.UseAdditionalCount &&
+                SettingCommon.Instance.FavoritesCountApi != 0)
             {
-                count = AppendSettingDialog.Instance.FavoritesCountApi;
+                count = SettingCommon.Instance.FavoritesCountApi;
             }
 
             // 前ページ取得の場合はページカウンタをインクリメント、それ以外の場合はページカウンタリセット