null値の比較を簡略化する (IDE0031, IDE0041)

diff --git a/OpenTween/Models/PostClass.cs b/OpenTween/Models/PostClass.cs
index 07a1622..e5f4f55 100644 (file)
--- a/OpenTween/Models/PostClass.cs
+++ b/OpenTween/Models/PostClass.cs
@@ -197,12 +197,7 @@ namespace OpenTween.Models
         }
 
         public string TextSingleLine
-        {
-            get
-            {
-                return this.TextFromApi == null ? null : this.TextFromApi.Replace("\n", " ");
-            }
-        }
+            => this.TextFromApi?.Replace("\n", " ");
 
         public bool IsFav
         {

diff --git a/OpenTween/Thumbnail/Services/Tinami.cs b/OpenTween/Thumbnail/Services/Tinami.cs
index 22bfa6f..e1eb573 100644 (file)
--- a/OpenTween/Thumbnail/Services/Tinami.cs
+++ b/OpenTween/Thumbnail/Services/Tinami.cs
@@ -82,7 +82,7 @@ namespace OpenTween.Thumbnail.Services
                 {
                     MediaPageUrl = url,
                     ThumbnailImageUrl = thumbUrlElm.Attribute("url").Value,
-                    TooltipText = descElm == null ? null : descElm.Value,
+                    TooltipText = descElm?.Value,
                 };
             }
             catch (HttpRequestException) { }

diff --git a/OpenTween/Thumbnail/Services/ViaMe.cs b/OpenTween/Thumbnail/Services/ViaMe.cs
index 8cb1196..84b4cc2 100644 (file)
--- a/OpenTween/Thumbnail/Services/ViaMe.cs
+++ b/OpenTween/Thumbnail/Services/ViaMe.cs
@@ -87,7 +87,7 @@ namespace OpenTween.Thumbnail.Services
                     {
                         MediaPageUrl = url,
                         ThumbnailImageUrl = thumbUrlElm.Value,
-                        TooltipText = textElm == null ? null : textElm.Value,
+                        TooltipText = textElm?.Value,
                     };
                 }
             }

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 435c757..25d31e5 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1811,7 +1811,7 @@ namespace OpenTween
                             if (string.IsNullOrEmpty(bText)) return;
 
                             var image = this.IconCache.TryGetFromCache(post.ImageUrl);
-                            gh.Notify(nt, post.StatusId.ToString(), title.ToString(), bText, image == null ? null : image.Image, post.ImageUrl);
+                            gh.Notify(nt, post.StatusId.ToString(), title.ToString(), bText, image?.Image, post.ImageUrl);
                         }
                     }
                     else
@@ -8368,8 +8368,7 @@ namespace OpenTween
                 {
                     if (dialog.ShowDialog(this) == DialogResult.Cancel) return false;
 
-                    var selectedTab = dialog.SelectedTab;
-                    tabName = selectedTab == null ? null : selectedTab.TabName;
+                    tabName = dialog.SelectedTab?.TabName;
                 }
 
                 ListTab.SelectedTab.Focus();

diff --git a/OpenTween/WebBrowserController.cs b/OpenTween/WebBrowserController.cs
index dd678ef..2df6853 100644 (file)
--- a/OpenTween/WebBrowserController.cs
+++ b/OpenTween/WebBrowserController.cs
@@ -382,7 +382,7 @@ namespace OpenTween
             try
             {
                 var urlStr = MyCommon.IDNEncode(pwszUrl);
-                if (object.ReferenceEquals(urlStr, null)) return WebBrowserAPI.URLPOLICY_DISALLOW;
+                if (urlStr == null) return WebBrowserAPI.URLPOLICY_DISALLOW;
                 var url = new Uri(urlStr);
                 if (url.Scheme == "data")
                 {