OSDN Git Service

メソッドに式本体を使用する (IDE0021, IDE0022, IDE0025, IDE0027)
authorKimura Youichi <kim.upsilon@bucyou.net>
Tue, 29 May 2018 02:40:28 +0000 (11:40 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Tue, 29 May 2018 04:32:51 +0000 (13:32 +0900)
98 files changed:
OpenTween/Api/ApiLimit.cs
OpenTween/Api/BitlyApi.cs
OpenTween/Api/MicrosoftTranslatorApi.cs
OpenTween/Api/TwitterApi.cs
OpenTween/Api/TwitterApiStatus.cs
OpenTween/ApiInfoDialog.cs
OpenTween/AppendSettingDialog.cs
OpenTween/AtIdSupplement.cs
OpenTween/Bing.cs
OpenTween/Connection/Imgur.cs
OpenTween/Connection/LazyJson.cs
OpenTween/Connection/Mobypicture.cs
OpenTween/Connection/Networking.cs
OpenTween/Connection/TwitterApiConnection.cs
OpenTween/Connection/TwitterPhoto.cs
OpenTween/ControlTransaction.cs
OpenTween/DetailsListView.cs
OpenTween/EventViewerDialog.cs
OpenTween/FilterDialog.cs
OpenTween/HashtagManage.cs
OpenTween/HookGlobalHotkey.cs
OpenTween/ImageCache.cs
OpenTween/ImageListViewItem.cs
OpenTween/InputDialog.cs
OpenTween/InputTabName.cs
OpenTween/LRUCacheDictionary.cs
OpenTween/ListAvailable.cs
OpenTween/ListElement.cs
OpenTween/ListManage.cs
OpenTween/MediaItem.cs
OpenTween/MediaSelector.cs
OpenTween/MemoryImage.cs
OpenTween/Models/FilterTabModel.cs
OpenTween/Models/MediaInfo.cs
OpenTween/Models/PostClass.cs
OpenTween/Models/PostFilterRule.cs
OpenTween/Models/PublicSearchTabModel.cs
OpenTween/Models/TabInformations.cs
OpenTween/Models/TabModel.cs
OpenTween/Models/TabUsageTypeExt.cs
OpenTween/MouseWheelMessageFilter.cs
OpenTween/MyCommon.cs
OpenTween/MyLists.cs
OpenTween/NativeMethods.cs
OpenTween/OTBaseForm.cs
OpenTween/OTPictureBox.cs
OpenTween/OTSplitContainer.cs
OpenTween/OpenURL.cs
OpenTween/SearchWordDialog.cs
OpenTween/SendErrorReportForm.cs
OpenTween/Setting/Panel/ActionPanel.cs
OpenTween/Setting/Panel/BasedPanel.cs
OpenTween/Setting/Panel/ConnectionPanel.cs
OpenTween/Setting/Panel/CooperatePanel.cs
OpenTween/Setting/Panel/FontPanel.cs
OpenTween/Setting/Panel/FontPanel2.cs
OpenTween/Setting/Panel/GetCountPanel.cs
OpenTween/Setting/Panel/GetPeriodPanel.cs
OpenTween/Setting/Panel/NotifyPanel.cs
OpenTween/Setting/Panel/PreviewPanel.cs
OpenTween/Setting/Panel/ProxyPanel.cs
OpenTween/Setting/Panel/SettingPanelBase.cs
OpenTween/Setting/Panel/ShortUrlPanel.cs
OpenTween/Setting/Panel/StartupPanel.cs
OpenTween/Setting/Panel/TweetActPanel.cs
OpenTween/Setting/Panel/TweetPrvPanel.cs
OpenTween/Setting/SettingAtIdList.cs
OpenTween/Setting/SettingBase.cs
OpenTween/Setting/SettingCommon.cs
OpenTween/Setting/SettingLocal.cs
OpenTween/Setting/SettingTabs.cs
OpenTween/ShortUrl.cs
OpenTween/ShortcutCommand.cs
OpenTween/TabsDialog.cs
OpenTween/Thumbnail/Services/FoursquareCheckin.cs
OpenTween/Thumbnail/Services/ImgAzyobuziNet.cs
OpenTween/Thumbnail/Services/MetaThumbnailService.cs
OpenTween/Thumbnail/Services/SimpleThumbnailService.cs
OpenTween/Thumbnail/Services/Tinami.cs
OpenTween/Thumbnail/Services/Tumblr.cs
OpenTween/Thumbnail/Services/ViaMe.cs
OpenTween/Thumbnail/Services/Vimeo.cs
OpenTween/Thumbnail/ThumbnailGenerator.cs
OpenTween/Thumbnail/ThumbnailInfo.cs
OpenTween/ToolStripAPIGauge.cs
OpenTween/ToolStripLabelHistory.cs
OpenTween/Tween.cs
OpenTween/TweenAboutBox.cs
OpenTween/TweetDetailsView.cs
OpenTween/TweetExtractor.cs
OpenTween/TweetFormatter.cs
OpenTween/TweetThumbnail.cs
OpenTween/Twitter.cs
OpenTween/UpdateDialog.cs
OpenTween/UserInfo.cs
OpenTween/UserInfoDialog.cs
OpenTween/WaitingDialog.cs
OpenTween/WebBrowserController.cs

index d4d2663..dc9d979 100644 (file)
@@ -62,21 +62,13 @@ namespace OpenTween.Api
         }
 
         public override bool Equals(object obj)
-        {
-            return this.Equals(obj as ApiLimit);
-        }
+            => this.Equals(obj as ApiLimit);
 
         public bool Equals(ApiLimit obj)
-        {
-            return obj != null &&
-                this.AccessLimitCount == obj.AccessLimitCount &&
-                this.AccessLimitRemain == obj.AccessLimitRemain &&
-                this.AccessLimitResetDate == obj.AccessLimitResetDate;
-        }
+            => obj != null && this.AccessLimitCount == obj.AccessLimitCount &&
+                this.AccessLimitRemain == obj.AccessLimitRemain && this.AccessLimitResetDate == obj.AccessLimitResetDate;
 
         public override int GetHashCode()
-        {
-            return this.AccessLimitCount ^ this.AccessLimitRemain ^ this.AccessLimitResetDate.GetHashCode();
-        }
+            => this.AccessLimitCount ^ this.AccessLimitRemain ^ this.AccessLimitResetDate.GetHashCode();
     }
 }
index 693fbf4..867c0db 100644 (file)
@@ -52,9 +52,7 @@ namespace OpenTween.Api
         }
 
         public BitlyApi(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public async Task<Uri> ShortenAsync(Uri srcUri, string domain = null)
         {
index a81094d..e07433f 100644 (file)
@@ -50,9 +50,7 @@ namespace OpenTween.Api
         }
 
         public MicrosoftTranslatorApi(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public async Task<string> TranslateAsync(string text, string langTo, string langFrom = null)
         {
index c4baee3..580912d 100644 (file)
@@ -725,14 +725,10 @@ namespace OpenTween.Api
         }
 
         public OAuthEchoHandler CreateOAuthEchoHandler(Uri authServiceProvider, Uri realm = null)
-        {
-            return ((TwitterApiConnection)this.apiConnection).CreateOAuthEchoHandler(authServiceProvider, realm);
-        }
+            => ((TwitterApiConnection)this.apiConnection).CreateOAuthEchoHandler(authServiceProvider, realm);
 
         public void Dispose()
-        {
-            this.apiConnection?.Dispose();
-        }
+            => this.apiConnection?.Dispose();
 
         /// <summary>JSON に出力する文字列を ECMA-404 に従ってエスケープする</summary>
         public static string EscapeJsonString(string rawText)
index 3b27d55..fc73729 100644 (file)
@@ -45,16 +45,12 @@ namespace OpenTween.Api
             public string EndpointName { get; }
 
             public AccessLimitUpdatedEventArgs(string endpointName)
-            {
-                this.EndpointName = endpointName;
-            }
+                => this.EndpointName = endpointName;
         }
         public event EventHandler<AccessLimitUpdatedEventArgs> AccessLimitUpdated;
 
         public TwitterApiStatus()
-        {
-            this.AccessLimit = new EndpointLimits(this);
-        }
+            => this.AccessLimit = new EndpointLimits(this);
 
         public void Reset()
         {
@@ -114,9 +110,7 @@ namespace OpenTween.Api
         }
 
         public void UpdateFromHeader(HttpResponseHeaders header, string endpointName)
-        {
-            this.UpdateFromHeader(header.ToDictionary(x => x.Key, x => string.Join(",", x.Value), StringComparer.OrdinalIgnoreCase), endpointName);
-        }
+            => this.UpdateFromHeader(header.ToDictionary(x => x.Key, x => string.Join(",", x.Value), StringComparer.OrdinalIgnoreCase), endpointName);
 
         public void UpdateFromHeader(IDictionary<string, string> header, string endpointName)
         {
@@ -151,9 +145,7 @@ namespace OpenTween.Api
         }
 
         protected virtual void OnAccessLimitUpdated(AccessLimitUpdatedEventArgs e)
-        {
-            this.AccessLimitUpdated?.Invoke(this, e);
-        }
+            => this.AccessLimitUpdated?.Invoke(this, e);
 
         public class EndpointLimits : IEnumerable<KeyValuePair<string, ApiLimit>>
         {
@@ -162,18 +154,11 @@ namespace OpenTween.Api
             private ConcurrentDictionary<string, ApiLimit> innerDict = new ConcurrentDictionary<string, ApiLimit>();
 
             public EndpointLimits(TwitterApiStatus owner)
-            {
-                this.Owner = owner;
-            }
+                => this.Owner = owner;
 
             public ApiLimit this[string endpoint]
             {
-                get
-                {
-                    return this.innerDict.TryGetValue(endpoint, out var limit)
-                        ? limit
-                        : null;
-                }
+                get => this.innerDict.TryGetValue(endpoint, out var limit) ? limit : null;
                 set
                 {
                     this.innerDict[endpoint] = value;
@@ -198,14 +183,10 @@ namespace OpenTween.Api
             }
 
             public IEnumerator<KeyValuePair<string, ApiLimit>> GetEnumerator()
-            {
-                return this.innerDict.GetEnumerator();
-            }
+                => this.innerDict.GetEnumerator();
 
             IEnumerator IEnumerable.GetEnumerator()
-            {
-                return this.GetEnumerator();
-            }
+                => this.GetEnumerator();
         }
     }
 }
index 148b72a..2fc9bf2 100644 (file)
@@ -35,9 +35,7 @@ namespace OpenTween
     public partial class ApiInfoDialog : OTBaseForm
     {
         public ApiInfoDialog()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private readonly List<string> _tlEndpoints = new List<string>
         {
@@ -125,9 +123,7 @@ namespace OpenTween
         }
 
         private void ApiInfoDialog_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            MyCommon.TwitterApiInfo.AccessLimitUpdated -= this.TwitterApiStatus_AccessLimitUpdated;
-        }
+            => MyCommon.TwitterApiInfo.AccessLimitUpdated -= this.TwitterApiStatus_AccessLimitUpdated;
 
         protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
         {
@@ -140,8 +136,6 @@ namespace OpenTween
     public class BufferedListView : ListView
     {
         public BufferedListView()
-        {
-            DoubleBuffered = true;
-        }
+            => this.DoubleBuffered = true;
     }
 }
index 4ed41fd..1f45d72 100644 (file)
@@ -297,9 +297,7 @@ namespace OpenTween
         }
 
         private void CheckPostAndGet_CheckedChanged(object sender, EventArgs e)
-        {
-            this.GetPeriodPanel.LabelPostAndGet.Visible = this.GetPeriodPanel.CheckPostAndGet.Checked && !tw.UserStreamActive;
-        }
+            => this.GetPeriodPanel.LabelPostAndGet.Visible = this.GetPeriodPanel.CheckPostAndGet.Checked && !tw.UserStreamActive;
 
         private void Setting_Shown(object sender, EventArgs e)
         {
@@ -350,14 +348,10 @@ namespace OpenTween
         }
 
         private void CreateAccountButton_Click(object sender, EventArgs e)
-        {
-            this.OpenUrl("https://twitter.com/signup");
-        }
+            => this.OpenUrl("https://twitter.com/signup");
 
         private void GetPeriodPanel_IntervalChanged(object sender, IntervalChangedEventArgs e)
-        {
-            this.IntervalChanged?.Invoke(sender, e);
-        }
+            => this.IntervalChanged?.Invoke(sender, e);
     }
 
     public class IntervalChangedEventArgs : EventArgs
@@ -370,21 +364,15 @@ namespace OpenTween
         public bool Lists;
         public bool UserTimeline;
 
-        public static IntervalChangedEventArgs ResetAll
+        public static IntervalChangedEventArgs ResetAll => new IntervalChangedEventArgs
         {
-            get
-            {
-                return new IntervalChangedEventArgs
-                {
-                    UserStream = true,
-                    Timeline = true,
-                    Reply = true,
-                    DirectMessage = true,
-                    PublicSearch = true,
-                    Lists = true,
-                    UserTimeline = true,
-                };
-            }
-        }
+            UserStream = true,
+            Timeline = true,
+            Reply = true,
+            DirectMessage = true,
+            PublicSearch = true,
+            Lists = true,
+            UserTimeline = true,
+        };
     }
 }
index 552e444..d87967d 100644 (file)
@@ -70,12 +70,7 @@ namespace OpenTween
         }
 
         public int ItemCount
-        {
-            get
-            {
-                return this.TextId.AutoCompleteCustomSource.Count;
-            }
-        }
+            => this.TextId.AutoCompleteCustomSource.Count;
 
         private void ButtonOK_Click(object sender, EventArgs e) /*Handles ButtonOK.Click*/
         {
@@ -138,9 +133,7 @@ namespace OpenTween
         }
 
         public AtIdSupplement()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public AtIdSupplement(List<string> ItemList, string startCharacter)
         {
index 84917cf..a0666cf 100644 (file)
@@ -173,28 +173,20 @@ namespace OpenTween
         }
 
         public Bing(HttpClient http)
-        {
-            this.translatorApi = new MicrosoftTranslatorApi(http);
-        }
+            => this.translatorApi = new MicrosoftTranslatorApi(http);
 
         /// <summary>
         /// Microsoft Translator API を使用した翻訳を非同期に行います
         /// </summary>
         /// <exception cref="HttpRequestException"/>
         public async Task<string> TranslateAsync(string text, string langFrom, string langTo)
-        {
-            return await this.translatorApi.TranslateAsync(text, langTo, langFrom)
+            => await this.translatorApi.TranslateAsync(text, langTo, langFrom)
                 .ConfigureAwait(false);
-        }
 
         public static string GetLanguageEnumFromIndex(int index)
-        {
-            return LanguageTable[index];
-        }
+            => LanguageTable[index];
 
         public static int GetIndexFromLanguageEnum(string lang)
-        {
-            return LanguageTable.IndexOf(lang);
-        }
+            => LanguageTable.IndexOf(lang);
     }
 }
index 086b609..965f2f6 100644 (file)
@@ -62,10 +62,7 @@ namespace OpenTween.Connection
             this.imgurApi = new ImgurApi();
         }
 
-        public int MaxMediaCount
-        {
-            get { return 1; }
-        }
+        public int MaxMediaCount => 1;
 
         public string SupportedFormatsStrForDialog
         {
@@ -83,9 +80,7 @@ namespace OpenTween.Connection
         public bool CanUseAltText => false;
 
         public bool CheckFileExtension(string fileExtension)
-        {
-            return SupportedExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
-        }
+            => SupportedExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
 
         public bool CheckFileSize(string fileExtension, long fileSize)
         {
@@ -94,9 +89,7 @@ namespace OpenTween.Connection
         }
 
         public long? GetMaxFileSize(string fileExtension)
-        {
-            return MaxFileSize;
-        }
+            => MaxFileSize;
 
         public async Task<PostStatusParams> UploadAsync(IMediaItem[] mediaItems, PostStatusParams postParams)
         {
@@ -145,9 +138,7 @@ namespace OpenTween.Connection
             => this.twitterConfig.ShortUrlLength + 1;
 
         public void UpdateTwitterConfiguration(TwitterConfiguration config)
-        {
-            this.twitterConfig = config;
-        }
+            => this.twitterConfig = config;
 
         public class ImgurApi
         {
index 07bab5a..da5c882 100644 (file)
@@ -41,9 +41,7 @@ namespace OpenTween.Connection
         private bool completed = false;
 
         public LazyJson(HttpResponseMessage response)
-        {
-            this.Response = response;
-        }
+            => this.Response = response;
 
         internal LazyJson(T instance)
         {
@@ -78,9 +76,7 @@ namespace OpenTween.Connection
         }
 
         public void Dispose()
-        {
-            this.Response?.Dispose();
-        }
+            => this.Response?.Dispose();
     }
 
     public static class LazyJson
index 65e7c2b..d961dc0 100644 (file)
@@ -86,10 +86,7 @@ namespace OpenTween.Connection
             this.mobypictureApi = new MobypictureApi(twitter.Api);
         }
 
-        public int MaxMediaCount
-        {
-            get { return 1; }
-        }
+        public int MaxMediaCount => 1;
 
         public string SupportedFormatsStrForDialog
         {
@@ -107,9 +104,7 @@ namespace OpenTween.Connection
         public bool CanUseAltText => false;
 
         public bool CheckFileExtension(string fileExtension)
-        {
-            return AllowedExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
-        }
+            => AllowedExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
 
         public bool CheckFileSize(string fileExtension, long fileSize)
         {
@@ -118,9 +113,7 @@ namespace OpenTween.Connection
         }
 
         public long? GetMaxFileSize(string fileExtension)
-        {
-            return MaxFileSize;
-        }
+            => MaxFileSize;
 
         public async Task<PostStatusParams> UploadAsync(IMediaItem[] mediaItems, PostStatusParams postParams)
         {
@@ -154,9 +147,7 @@ namespace OpenTween.Connection
             => this.twitterConfig.ShortUrlLength + 1;
 
         public void UpdateTwitterConfiguration(TwitterConfiguration config)
-        {
-            this.twitterConfig = config;
-        }
+            => this.twitterConfig = config;
 
         public class MobypictureApi
         {
index 878a3b7..c7d0030 100644 (file)
@@ -50,17 +50,14 @@ namespace OpenTween.Connection
         /// <summary>
         /// OpenTween 内で共通して使用する HttpClient インスタンス
         /// </summary>
-        public static HttpClient Http
-        {
-            get { return globalHttpClient; }
-        }
+        public static HttpClient Http => globalHttpClient;
 
         /// <summary>
         /// pbs.twimg.com で IPv4 を強制的に使用する
         /// </summary>
         public static bool ForceIPv4
         {
-            get { return forceIPv4; }
+            get => forceIPv4;
             set
             {
                 if (forceIPv4 == value)
index 5432270..b8dc482 100644 (file)
@@ -361,9 +361,7 @@ namespace OpenTween.Connection
             => this.Dispose(false);
 
         private void Networking_WebProxyChanged(object sender, EventArgs e)
-        {
-            this.InitializeHttpClients();
-        }
+            => this.InitializeHttpClients();
 
         public static async Task<Tuple<string, string>> GetRequestTokenAsync()
         {
index 04b1a15..5f473c1 100644 (file)
@@ -47,25 +47,14 @@ namespace OpenTween.Connection
             this.twitterConfig = twitterConfig;
         }
 
-        public int MaxMediaCount
-        {
-            get { return 4; }
-        }
+        public int MaxMediaCount => 4;
 
-        public string SupportedFormatsStrForDialog
-        {
-            get
-            {
-                return "Image Files(*.gif;*.jpg;*.jpeg;*.png)|*.gif;*.jpg;*.jpeg;*.png";
-            }
-        }
+        public string SupportedFormatsStrForDialog => "Image Files(*.gif;*.jpg;*.jpeg;*.png)|*.gif;*.jpg;*.jpeg;*.png";
 
         public bool CanUseAltText => true;
 
         public bool CheckFileExtension(string fileExtension)
-        {
-            return this.pictureExt.Contains(fileExtension.ToLowerInvariant());
-        }
+            => this.pictureExt.Contains(fileExtension.ToLowerInvariant());
 
         public bool CheckFileSize(string fileExtension, long fileSize)
         {
@@ -74,9 +63,7 @@ namespace OpenTween.Connection
         }
 
         public long? GetMaxFileSize(string fileExtension)
-        {
-            return this.twitterConfig.PhotoSizeLimit;
-        }
+            => this.twitterConfig.PhotoSizeLimit;
 
         public async Task<PostStatusParams> UploadAsync(IMediaItem[] mediaItems, PostStatusParams postParams)
         {
@@ -111,9 +98,7 @@ namespace OpenTween.Connection
             => 0;
 
         public void UpdateTwitterConfiguration(TwitterConfiguration config)
-        {
-            this.twitterConfig = config;
-        }
+            => this.twitterConfig = config;
 
         private async Task<long> UploadMediaItem(IMediaItem mediaItem)
         {
index 599710f..e369589 100644 (file)
@@ -34,24 +34,16 @@ namespace OpenTween
     public static class ControlTransaction
     {
         public static IDisposable Update(ListView control)
-        {
-            return new Transaction<ListView>(control, x => x.BeginUpdate(), x => x.EndUpdate());
-        }
+            => new Transaction<ListView>(control, x => x.BeginUpdate(), x => x.EndUpdate());
 
         public static IDisposable Update(ListBox control)
-        {
-            return new Transaction<ListBox>(control, x => x.BeginUpdate(), x => x.EndUpdate());
-        }
+            => new Transaction<ListBox>(control, x => x.BeginUpdate(), x => x.EndUpdate());
 
         public static IDisposable Update(ComboBox control)
-        {
-            return new Transaction<ComboBox>(control, x => x.BeginUpdate(), x => x.EndUpdate());
-        }
+            => new Transaction<ComboBox>(control, x => x.BeginUpdate(), x => x.EndUpdate());
 
         public static IDisposable Update(TreeView control)
-        {
-            return new Transaction<TreeView>(control, x => x.BeginUpdate(), x => x.EndUpdate());
-        }
+            => new Transaction<TreeView>(control, x => x.BeginUpdate(), x => x.EndUpdate());
 
         public static IDisposable Update(Control control)
         {
@@ -63,19 +55,13 @@ namespace OpenTween
         }
 
         public static IDisposable Layout(Control control)
-        {
-            return Layout(control, performLayout: true);
-        }
+            => Layout(control, performLayout: true);
 
         public static IDisposable Layout(Control control, bool performLayout)
-        {
-            return new Transaction<Control>(control, x => x.SuspendLayout(), x => x.ResumeLayout(performLayout));
-        }
+            => new Transaction<Control>(control, x => x.SuspendLayout(), x => x.ResumeLayout(performLayout));
 
         public static IDisposable Init(ISupportInitialize control)
-        {
-            return new Transaction<ISupportInitialize>(control, x => x.BeginInit(), x => x.EndInit());
-        }
+            => new Transaction<ISupportInitialize>(control, x => x.BeginInit(), x => x.EndInit());
 
         public static IDisposable Cursor(Control control, Cursor newCursor)
         {
@@ -116,9 +102,7 @@ namespace OpenTween
             }
 
             public void Dispose()
-            {
-                this.endTransaction(this.control);
-            }
+                => this.endTransaction(this.control);
         }
     }
 }
index 1b5382c..65209ea 100644 (file)
@@ -131,29 +131,19 @@ namespace OpenTween.OpenTweenCustomControl
         }
 
         public void ChangeItemBackColor(int index, Color backColor)
-        {
-            ChangeSubItemBackColor(index, 0, backColor);
-        }
+            => this.ChangeSubItemBackColor(index, 0, backColor);
 
         public void ChangeItemForeColor(int index, Color foreColor)
-        {
-            ChangeSubItemForeColor(index, 0, foreColor);
-        }
+            => this.ChangeSubItemForeColor(index, 0, foreColor);
 
         public void ChangeItemFont(int index, Font fnt)
-        {
-            ChangeSubItemFont(index, 0, fnt);
-        }
+            => this.ChangeSubItemFont(index, 0, fnt);
 
         public void ChangeItemFontAndColor(int index, Color foreColor, Font fnt)
-        {
-            ChangeSubItemStyles(index, 0, BackColor, foreColor, fnt);
-        }
+            => this.ChangeSubItemStyles(index, 0, BackColor, foreColor, fnt);
 
         public void ChangeItemStyles(int index, Color backColor, Color foreColor, Font fnt)
-        {
-            ChangeSubItemStyles(index, 0, backColor, foreColor, fnt);
-        }
+            => this.ChangeSubItemStyles(index, 0, backColor, foreColor, fnt);
 
         public void ChangeSubItemBackColor(int itemIndex, int subitemIndex, Color backColor)
         {
index a2de273..4de5c3b 100644 (file)
@@ -125,9 +125,7 @@ namespace OpenTween
         }
 
         private MyCommon.EVENTTYPE ParseEventTypeFromTag()
-        {
-            return (MyCommon.EVENTTYPE)Enum.Parse(typeof(MyCommon.EVENTTYPE), _curTab.Tag.ToString());
-        }
+            => (MyCommon.EVENTTYPE)Enum.Parse(typeof(MyCommon.EVENTTYPE), _curTab.Tag.ToString());
 
         private bool IsFilterMatch(Twitter.FormattedEvent x)
         {
@@ -175,19 +173,13 @@ namespace OpenTween
         }
 
         private void CheckExcludeMyEvent_CheckedChanged(object sender, EventArgs e)
-        {
-            CreateFilterdEventSource();
-        }
+            => this.CreateFilterdEventSource();
 
         private void ButtonRefresh_Click(object sender, EventArgs e)
-        {
-            CreateFilterdEventSource();
-        }
+            => this.CreateFilterdEventSource();
 
         private void TabEventType_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            CreateFilterdEventSource();
-        }
+            => this.CreateFilterdEventSource();
 
         private void TabEventType_Selecting(object sender, TabControlCancelEventArgs e)
         {
@@ -222,9 +214,7 @@ namespace OpenTween
         }
 
         private void EventList_CacheVirtualItems(object sender, CacheVirtualItemsEventArgs e)
-        {
-            CreateCache(e.StartIndex, e.EndIndex);
-        }
+            => this.CreateCache(e.StartIndex, e.EndIndex);
 
         private void CreateCache(int StartIndex, int EndIndex)
         {
index 1374f7b..36eeb86 100644 (file)
@@ -73,7 +73,7 @@ namespace OpenTween
 
         private EnableButtonMode RuleEnableButtonMode
         {
-            get { return this._ruleEnableButtonMode; }
+            get => this._ruleEnableButtonMode;
             set
             {
                 this._ruleEnableButtonMode = value;
@@ -87,9 +87,7 @@ namespace OpenTween
         private EnableButtonMode _ruleEnableButtonMode = FilterDialog.EnableButtonMode.NotSelected;
 
         public FilterDialog()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void SetFilters(string tabName)
         {
@@ -239,9 +237,7 @@ namespace OpenTween
         }
 
         public void SetCurrent(string TabName)
-        {
-            _cur = TabName;
-        }
+            => this._cur = TabName;
 
         public void AddNewFilter(string id, string msg)
         {
@@ -725,10 +721,7 @@ namespace OpenTween
         }
 
         private bool IsValidLambdaExp(string text)
-        {
-            return false;
-            // TODO DynamicQuery相当のGPLv3互換なライブラリで置換する
-        }
+            => false; // TODO DynamicQuery相当のGPLv3互換なライブラリで置換する
 
         private bool IsValidRegexp(string text)
         {
@@ -883,14 +876,10 @@ namespace OpenTween
         }
 
         private void ButtonClose_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
+            => this.Close();
 
         private void FilterDialog_FormClosed(object sender, FormClosedEventArgs e)
-        {
-            _directAdd = false;
-        }
+            => this._directAdd = false;
 
         private void FilterDialog_KeyDown(object sender, KeyEventArgs e)
         {
@@ -1192,19 +1181,13 @@ namespace OpenTween
         }
 
         private void OptMove_CheckedChanged(object sender, EventArgs e)
-        {
-            CheckMark.Enabled = !OptMove.Checked;
-        }
+            => this.CheckMark.Enabled = !OptMove.Checked;
 
         private void ButtonRuleUp_Click(object sender, EventArgs e)
-        {
-            MoveSelectedRules(up: true);
-        }
+            => this.MoveSelectedRules(up: true);
 
         private void ButtonRuleDown_Click(object sender, EventArgs e)
-        {
-            MoveSelectedRules(up: false);
-        }
+            => this.MoveSelectedRules(up: false);
 
         private void MoveSelectedRules(bool up)
         {
index c7787f0..d6b93ae 100644 (file)
@@ -250,9 +250,7 @@ namespace OpenTween
         }
 
         private void HistoryHashList_DoubleClick(object sender, EventArgs e)
-        {
-            this.OK_Button_Click(null, null);
-        }
+            => this.OK_Button_Click(null, null);
 
         public void ToggleHash()
         {
@@ -281,9 +279,7 @@ namespace OpenTween
         }
 
         public void ClearHashtag()
-        {
-            this.UseHash = "";
-        }
+            => this.UseHash = "";
 
         public void SetPermanentHash(string hash)
         {
@@ -423,8 +419,6 @@ namespace OpenTween
         }
 
         private void CheckNotAddToAtReply_CheckedChanged(object sender, EventArgs e)
-        {
-            this.IsNotAddToAtReply = CheckNotAddToAtReply.Checked;
-        }
+            => this.IsNotAddToAtReply = CheckNotAddToAtReply.Checked;
     }
 }
index cc4e5b0..ee05a07 100644 (file)
@@ -85,14 +85,10 @@ namespace OpenTween
         }
 
         public void OnHandleCreated(Object sender, EventArgs e)
-        {
-            this.AssignHandle(_targetForm.Handle);
-        }
+            => this.AssignHandle(_targetForm.Handle);
 
         public void OnHandleDestroyed(Object sender, EventArgs e)
-        {
-            this.ReleaseHandle();
-        }
+            => this.ReleaseHandle();
 
         public bool RegisterOriginalHotkey(Keys hotkey, int hotkeyValue, ModKeys modifiers)
         {
index 1f93b3a..8d7f19a 100644 (file)
@@ -69,9 +69,7 @@ namespace OpenTween
         /// 保持しているキャッシュの件数
         /// </summary>
         public long CacheCount
-        {
-            get { return this.innerDictionary.Count; }
-        }
+            => this.innerDictionary.Count;
 
         /// <summary>
         /// 破棄されたキャッシュの件数
index 43b6da6..c243379 100644 (file)
@@ -114,12 +114,7 @@ namespace OpenTween
         }
 
         public MemoryImage Image
-        {
-            get
-            {
-                return (MemoryImage)this.imageReference.Target;
-            }
-        }
+            => (MemoryImage)this.imageReference.Target;
 
         public Task RefreshImageAsync()
         {
index ba7d3aa..c47253a 100644 (file)
@@ -33,34 +33,22 @@ namespace OpenTween
     public partial class InputDialog : OTBaseForm
     {
         protected InputDialog()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void buttonOK_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.OK;
-        }
+            => this.DialogResult = DialogResult.OK;
 
         private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-        }
+            => this.DialogResult = DialogResult.Cancel;
 
         public static DialogResult Show(string text, out string inputText)
-        {
-            return Show(null, text, "", out inputText);
-        }
+            => Show(null, text, "", out inputText);
 
         public static DialogResult Show(IWin32Window owner, string text, out string inputText)
-        {
-            return Show(owner, text, "", out inputText);
-        }
+            => Show(owner, text, "", out inputText);
 
         public static DialogResult Show(string text, string caption, out string inputText)
-        {
-            return Show(null, text, caption, out inputText);
-        }
+            => Show(null, text, caption, out inputText);
 
         public static DialogResult Show(IWin32Window owner, string text, string caption, out string inputText)
         {
index cda919a..7623a77 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween
     public partial class InputTabName : OTBaseForm
     {
         public InputTabName()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void OK_Button_Click(object sender, EventArgs e)
         {
index 64e4d17..05ee80c 100644 (file)
@@ -53,9 +53,7 @@ namespace OpenTween
             public KeyValuePair<TKey, TValue> Item { get; }
 
             public CacheRemovedEventArgs(KeyValuePair<TKey, TValue> item)
-            {
-                this.Item = item;
-            }
+                => this.Item = item;
         }
         public event EventHandler<CacheRemovedEventArgs> CacheRemoved;
 
@@ -114,9 +112,7 @@ namespace OpenTween
         }
 
         public void Add(TKey key, TValue value)
-        {
-            this.Add(new KeyValuePair<TKey, TValue>(key, value));
-        }
+            => this.Add(new KeyValuePair<TKey, TValue>(key, value));
 
         public void Add(KeyValuePair<TKey, TValue> item)
         {
@@ -129,9 +125,7 @@ namespace OpenTween
         }
 
         public bool ContainsKey(TKey key)
-        {
-            return this.innerDict.ContainsKey(key);
-        }
+            => this.innerDict.ContainsKey(key);
 
         public bool Contains(KeyValuePair<TKey, TValue> item)
         {
@@ -180,14 +174,10 @@ namespace OpenTween
         }
 
         public ICollection<TKey> Keys
-        {
-            get { return this.innerDict.Keys; }
-        }
+            => this.innerDict.Keys;
 
         public ICollection<TValue> Values
-        {
-            get { return this.innerDict.Values.Select(x => x.Value.Value).ToList(); }
-        }
+            => this.innerDict.Values.Select(x => x.Value.Value).ToList();
 
         public TValue this[TKey key]
         {
@@ -245,23 +235,15 @@ namespace OpenTween
         }
 
         public int Count
-        {
-            get { return this.innerDict.Count; }
-        }
+            => this.innerDict.Count;
 
         public bool IsReadOnly
-        {
-            get { return false; }
-        }
+            => false;
 
         public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-        {
-            return this.innerDict.Select(x => x.Value.Value).GetEnumerator();
-        }
+            => this.innerDict.Select(x => x.Value.Value).GetEnumerator();
 
         IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this.GetEnumerator();
-        }
+            => this.GetEnumerator();
     }
 }
index e6ca0ac..f1a8407 100644 (file)
@@ -41,9 +41,7 @@ namespace OpenTween
         public ListElement SelectedList { get; private set; }
 
         public ListAvailable()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void OK_Button_Click(object sender, EventArgs e)
         {
index 380225d..d6e769c 100644 (file)
@@ -107,14 +107,10 @@ namespace OpenTween
         }
 
         public async Task GetMoreMembers()
-        {
-            this.Cursor = await this._tw.GetListMembers(this.Id, this._members, this.Cursor)
+            => this.Cursor = await this._tw.GetListMembers(this.Id, this._members, this.Cursor)
                 .ConfigureAwait(false);
-        }
 
         public override string ToString()
-        {
-            return "@" + Username + "/" + Name + " [" + (this.IsPublic ? "public" : "Protected") + "]";
-        }
+            => $"@{Username}/{Name} [{(this.IsPublic ? "public" : "Protected")}]";
     }
 }
index e9a9a14..b795308 100644 (file)
@@ -421,9 +421,7 @@ namespace OpenTween
             public bool IsCreated { get; private set; } = false;
 
             public NewListElement(Twitter tw)
-            {
-                this._tw = tw;
-            }
+                => this._tw = tw;
 
             public override async Task Refresh()
             {
index 5eb4299..26dff95 100644 (file)
@@ -95,9 +95,7 @@ namespace OpenTween
         public string AltText { get; set; }
 
         public FileMediaItem(string path)
-        {
-            this.FileInfo = new FileInfo(path);
-        }
+            => this.FileInfo = new FileInfo(path);
 
         public FileMediaItem(FileInfo fileInfo)
             : this(fileInfo.FullName)
@@ -105,29 +103,19 @@ namespace OpenTween
         }
 
         public string Path
-        {
-            get { return this.FileInfo.FullName; }
-        }
+            => this.FileInfo.FullName;
 
         public string Name
-        {
-            get { return this.FileInfo.Name; }
-        }
+            => this.FileInfo.Name;
 
         public string Extension
-        {
-            get { return this.FileInfo.Extension; }
-        }
+            => this.FileInfo.Extension;
 
         public bool Exists
-        {
-            get { return this.FileInfo.Exists; }
-        }
+            => this.FileInfo.Exists;
 
         public long Size
-        {
-            get { return this.FileInfo.Length; }
-        }
+            => this.FileInfo.Length;
 
         public bool IsImage
         {
@@ -164,9 +152,7 @@ namespace OpenTween
         }
 
         public Stream OpenRead()
-        {
-            return this.FileInfo.OpenRead();
-        }
+            => this.FileInfo.OpenRead();
 
         public void CopyTo(Stream stream)
         {
@@ -203,34 +189,22 @@ namespace OpenTween
         public string AltText { get; set; }
 
         public string Name
-        {
-            get { return this.Path.Substring(PathPrefix.Length); }
-        }
+            => this.Path.Substring(PathPrefix.Length);
 
         public string Extension
-        {
-            get { return this._image.ImageFormatExt; }
-        }
+            => this._image.ImageFormatExt;
 
         public bool Exists
-        {
-            get { return this._image != null; }
-        }
+            => this._image != null;
 
         public long Size
-        {
-            get { return this._image.Stream.Length; }
-        }
+            => this._image.Stream.Length;
 
         public bool IsImage
-        {
-            get { return true; }
-        }
+            => true;
 
         public MemoryImage CreateImage()
-        {
-            return this._image.Clone();
-        }
+            => this._image.Clone();
 
         public Stream OpenRead()
         {
@@ -253,9 +227,7 @@ namespace OpenTween
         }
 
         public void CopyTo(Stream stream)
-        {
-            this._image.Stream.WriteTo(stream);
-        }
+            => this._image.Stream.WriteTo(stream);
 
         protected virtual void Dispose(bool disposing)
         {
index f0f2662..e811634 100644 (file)
@@ -54,9 +54,7 @@ namespace OpenTween
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public string ServiceName
-        {
-            get { return ImageServiceCombo.Text; }
-        }
+            => this.ImageServiceCombo.Text;
 
         /// <summary>
         /// 選択されている投稿先を示すインデックスを取得する。
@@ -64,9 +62,7 @@ namespace OpenTween
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public int ServiceIndex
-        {
-            get { return ImageServiceCombo.SelectedIndex; }
-        }
+            => this.ImageServiceCombo.SelectedIndex;
 
         /// <summary>
         /// 選択されている投稿先の IMediaUploadService を取得する。
@@ -99,9 +95,7 @@ namespace OpenTween
         /// 利用可能な全ての IMediaUploadService インスタンスを取得する。
         /// </summary>
         public ICollection<IMediaUploadService> GetServices()
-        {
-            return this.pictureService.Values;
-        }
+            => this.pictureService.Values;
 
         private class SelectedMedia
         {
@@ -122,27 +116,15 @@ namespace OpenTween
             }
 
             public bool IsValid
-            {
-                get
-                {
-                    return this.Item != null && this.Type != MyCommon.UploadFileType.Invalid;
-                }
-            }
+                => this.Item != null && this.Type != MyCommon.UploadFileType.Invalid;
 
             public string Path
-            {
-                get
-                {
-                    return this.Item?.Path ?? "";
-                }
-            }
+                => this.Item?.Path ?? "";
 
             public string AltText => this.Item?.AltText ?? "";
 
             public override string ToString()
-            {
-                return this.Text;
-            }
+                => this.Text;
         }
 
         private Dictionary<string, IMediaUploadService> pictureService;
@@ -485,9 +467,7 @@ namespace OpenTween
         }
 
         private void ImageFromSelectedFile(IMediaItem item, bool noMsgBox)
-        {
-            ImageFromSelectedFile(-1, item, noMsgBox);
-        }
+            => this.ImageFromSelectedFile(-1, item, noMsgBox);
 
         private void ImageFromSelectedFile(int index, IMediaItem item, bool noMsgBox)
         {
@@ -601,9 +581,7 @@ namespace OpenTween
         }
 
         private void ImageCancelButton_Click(object sender, EventArgs e)
-        {
-            EndSelection();
-        }
+            => this.EndSelection();
 
         private void ImageSelection_KeyDown(object sender, KeyEventArgs e)
         {
@@ -784,9 +762,7 @@ namespace OpenTween
         }
 
         private void SetSelectedImagePage(IMediaItem item, MyCommon.UploadFileType type)
-        {
-            SetImagePage(-1, item, type);
-        }
+            => this.SetImagePage(-1, item, type);
 
         private void SetImagePage(int index, IMediaItem item, MyCommon.UploadFileType type)
         {
@@ -805,9 +781,7 @@ namespace OpenTween
         }
 
         private void ClearSelectedImagePage()
-        {
-            ClearImagePage(-1);
-        }
+            => this.ClearImagePage(-1);
 
         private void ClearImagePage(int index)
         {
@@ -837,9 +811,7 @@ namespace OpenTween
         }
 
         private void ImagePageCombo_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            ValidateSelectedImagePage();
-        }
+            => this.ValidateSelectedImagePage();
 
         private void AlternativeTextBox_Validating(object sender, CancelEventArgs e)
         {
index 51292e8..10d37c1 100644 (file)
@@ -107,9 +107,7 @@ namespace OpenTween
         /// MemoryImage が保持している画像のフォーマット
         /// </summary>
         public ImageFormat ImageFormat
-        {
-            get { return this.Image.RawFormat; }
-        }
+            => this.Image.RawFormat;
 
         /// <summary>
         /// MemoryImage が保持している画像のフォーマットに相当する拡張子 (ピリオド付き)
@@ -186,9 +184,7 @@ namespace OpenTween
         }
 
         public override bool Equals(object other)
-        {
-            return this.Equals(other as MemoryImage);
-        }
+            => this.Equals(other as MemoryImage);
 
         public bool Equals(MemoryImage other)
         {
@@ -219,9 +215,7 @@ namespace OpenTween
         }
 
         object ICloneable.Clone()
-        {
-            return this.Clone();
-        }
+            => this.Clone();
 
         protected virtual void Dispose(bool disposing)
         {
index 8fab3d6..6345a62 100644 (file)
@@ -136,9 +136,7 @@ namespace OpenTween.Models
         }
 
         private void OnFilterModified(object sender, PropertyChangedEventArgs e)
-        {
-            this.FilterModified = true;
-        }
+            => this.FilterModified = true;
 
         public PostFilterRule[] FilterArray
         {
index 0fea3f1..a3330ca 100644 (file)
@@ -49,14 +49,9 @@ namespace OpenTween.Models
             => obj is MediaInfo info && info.Url == this.Url && info.VideoUrl == this.VideoUrl;
 
         public override int GetHashCode()
-        {
-            return (this.Url == null ? 0 : this.Url.GetHashCode()) ^
-                   (this.VideoUrl == null ? 0 : this.VideoUrl.GetHashCode());
-        }
+            => (this.Url?.GetHashCode() ?? 0) ^ (this.VideoUrl?.GetHashCode() ?? 0);
 
         public override string ToString()
-        {
-            return this.Url;
-        }
+            => this.Url;
     }
 }
index e5f4f55..e94da63 100644 (file)
@@ -230,10 +230,7 @@ namespace OpenTween.Models
 
         public bool IsProtect
         {
-            get
-            {
-                return _IsProtect;
-            }
+            get => this._IsProtect;
             set
             {
                 if (value)
@@ -249,10 +246,7 @@ namespace OpenTween.Models
         }
         public bool IsMark
         {
-            get
-            {
-                return _IsMark;
-            }
+            get => this._IsMark;
             set
             {
                 if (value)
@@ -268,10 +262,7 @@ namespace OpenTween.Models
         }
         public long? InReplyToStatusId
         {
-            get
-            {
-                return _InReplyToStatusId;
-            }
+            get => this._InReplyToStatusId;
             set
             {
                 if (value != null)
@@ -288,10 +279,7 @@ namespace OpenTween.Models
 
         public bool IsDeleted
         {
-            get
-            {
-                return _IsDeleted;
-            }
+            get => this._IsDeleted;
             set
             {
                 if (value)
@@ -308,19 +296,11 @@ namespace OpenTween.Models
         }
 
         protected virtual PostClass RetweetSource
-        {
-            get
-            {
-                return TabInformations.GetInstance().RetweetSource(this.RetweetedId.Value);
-            }
-        }
+            => TabInformations.GetInstance().RetweetSource(this.RetweetedId.Value);
 
         public StatusGeo? PostGeo
         {
-            get
-            {
-                return _postGeo;
-            }
+            get => this._postGeo;
             set
             {
                 if (value != null)
@@ -336,12 +316,7 @@ namespace OpenTween.Models
         }
 
         public int StateIndex
-        {
-            get
-            {
-                return (int)_states - 1;
-            }
-        }
+            => (int)_states - 1;
 
         // 互換性のために用意
         public string SourceHtml
@@ -507,8 +482,6 @@ namespace OpenTween.Models
         }
 
         public override int GetHashCode()
-        {
-            return this.StatusId.GetHashCode();
-        }
+            => this.StatusId.GetHashCode();
     }
 }
index a69c95d..0e360c7 100644 (file)
@@ -54,9 +54,7 @@ namespace OpenTween.Models
         /// </summary>
         [XmlIgnore]
         public string SummaryText
-        {
-            get { return this.MakeSummary(); }
-        }
+            => this.MakeSummary();
 
         /// <summary>
         /// ExecFilter() メソッドの実行時に自動でコンパイルを実行する
@@ -237,11 +235,9 @@ namespace OpenTween.Models
             this.ExUseNameField = true;
         }
 
+        // TODO: TabsClass とかの改修が終わるまでデフォルト有効
         static PostFilterRule()
-        {
-            // TODO: TabsClass とかの改修が終わるまでデフォルト有効
-            PostFilterRule.AutoCompile = true;
-        }
+            => PostFilterRule.AutoCompile = true;
 
         /// <summary>
         /// 振り分けルールをコンパイルします
@@ -516,9 +512,7 @@ namespace OpenTween.Models
         /// </summary>
         /// <returns>振り分けルールの概要</returns>
         public override string ToString()
-        {
-            return this.SummaryText;
-        }
+            => this.SummaryText;
 
         protected override void OnPropertyChanged(PropertyChangedEventArgs e)
         {
@@ -714,9 +708,7 @@ namespace OpenTween.Models
         }
 
         public override bool Equals(object obj)
-        {
-            return this.Equals(obj as PostFilterRule);
-        }
+            => this.Equals(obj as PostFilterRule);
 
         public bool Equals(PostFilterRule other)
         {
index c2e6423..43d3e1d 100644 (file)
@@ -41,7 +41,7 @@ namespace OpenTween.Models
 
         public string SearchWords
         {
-            get { return this._searchWords; }
+            get => this._searchWords;
             set
             {
                 this._searchWords = value;
@@ -51,7 +51,7 @@ namespace OpenTween.Models
 
         public string SearchLang
         {
-            get { return this._searchLang; }
+            get => this._searchLang;
             set
             {
                 this._searchLang = value;
index f5b8b37..721591d 100644 (file)
@@ -79,16 +79,11 @@ namespace OpenTween.Models
         }
 
         public static TabInformations GetInstance()
-        {
-            return _instance;    //singleton
-        }
+            => _instance; // singleton
 
         public List<ListElement> SubscribableLists
         {
-            get
-            {
-                return _lists;
-            }
+            get => this._lists;
             set
             {
                 if (value != null && value.Count > 0)
@@ -165,14 +160,10 @@ namespace OpenTween.Models
         }
 
         public bool ContainsTab(string TabText)
-        {
-            return this.Tabs.ContainsKey(TabText);
-        }
+            => this.Tabs.ContainsKey(TabText);
 
         public bool ContainsTab(TabModel ts)
-        {
-            return this.Tabs.ContainsValue(ts);
-        }
+            => this.Tabs.ContainsValue(ts);
 
         /// <summary>
         /// 指定されたタブ名を元に、既存のタブ名との重複を避けた名前を生成します
@@ -181,9 +172,7 @@ namespace OpenTween.Models
         /// <returns>生成されたタブ名</returns>
         /// <exception cref="TabException">タブ名の生成を 100 回試行して失敗した場合</exception>
         public string MakeTabName(string baseTabName)
-        {
-            return this.MakeTabName(baseTabName, 100);
-        }
+            => this.MakeTabName(baseTabName, 100);
 
         /// <summary>
         /// 指定されたタブ名を元に、既存のタブ名との重複を避けた名前を生成します
@@ -211,12 +200,7 @@ namespace OpenTween.Models
         }
 
         public Dictionary<string, TabModel>.KeyCollection KeysTab
-        {
-            get
-            {
-                return this.Tabs.Keys;
-            }
-        }
+            => this.Tabs.Keys;
 
         public SortOrder SortOrder { get; private set; }
 
@@ -267,11 +251,7 @@ namespace OpenTween.Models
         //        }
         //    }
         public PostClass RetweetSource(long Id)
-        {
-            return this.Posts.TryGetValue(Id, out var status)
-                ? status
-                : null;
-        }
+            => this.Posts.TryGetValue(Id, out var status) ? status : null;
 
         public void ScrubGeoReserve(long id, long upToStatusId)
         {
@@ -322,10 +302,7 @@ namespace OpenTween.Models
         }
 
         public int SubmitUpdate()
-        {
-            return this.SubmitUpdate(out var soundFile, out var notifyPosts,
-                out var newMentionOrDm, out var isDeletePost);
-        }
+            => this.SubmitUpdate(out var soundFile, out var notifyPosts, out var newMentionOrDm, out var isDeletePost);
 
         public int SubmitUpdate(out string soundFile, out PostClass[] notifyPosts,
             out bool newMentionOrDm, out bool isDeletePost)
index 4eec2be..f8801cd 100644 (file)
@@ -77,9 +77,7 @@ namespace OpenTween.Models
         private readonly object _lockObj = new object();
 
         protected TabModel(string tabName)
-        {
-            this.TabName = tabName;
-        }
+            => this.TabName = tabName;
 
         public abstract Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress);
 
@@ -129,9 +127,7 @@ namespace OpenTween.Models
         }
 
         public virtual void EnqueueRemovePost(long statusId, bool setIsDeleted)
-        {
-            this.removeQueue.Enqueue(statusId);
-        }
+            => this.removeQueue.Enqueue(statusId);
 
         public virtual bool RemovePostImmediately(long statusId)
         {
index abff4bb..f217eb4 100644 (file)
@@ -56,24 +56,18 @@ namespace OpenTween.Models
         /// デフォルトタブかどうかを示す値を取得します。
         /// </summary>
         public static bool IsDefault(this MyCommon.TabUsageType tabType)
-        {
-            return (tabType & DefaultTabTypeMask) != 0;
-        }
+            => (tabType & DefaultTabTypeMask) != 0;
 
         /// <summary>
         /// 振り分け可能タブかどうかを示す値を取得します。
         /// </summary>
         public static bool IsDistributable(this MyCommon.TabUsageType tabType)
-        {
-            return (tabType & DistributableTabTypeMask) != 0;
-        }
+            => (tabType & DistributableTabTypeMask) != 0;
 
         /// <summary>
         /// 内部ストレージを使用するタブかどうかを示す値を取得します。
         /// </summary>
         public static bool IsInnerStorage(this MyCommon.TabUsageType tabType)
-        {
-            return (tabType & InnerStorageTabTypeMask) != 0;
-        }
+            => (tabType & InnerStorageTabTypeMask) != 0;
     }
 }
index 5d7e778..0ab0345 100644 (file)
@@ -38,19 +38,13 @@ namespace OpenTween
         private readonly List<Control> controls = new List<Control>();
 
         public MouseWheelMessageFilter()
-        {
-            Application.AddMessageFilter(this);
-        }
+            => Application.AddMessageFilter(this);
 
         public void Register(Control target)
-        {
-            this.controls.Add(target);
-        }
+            => this.controls.Add(target);
 
         public void Unregister(Control target)
-        {
-            this.controls.Remove(target);
-        }
+            => this.controls.Remove(target);
 
         public bool PreFilterMessage(ref Message m)
         {
index d2e6de2..caca10a 100644 (file)
@@ -241,9 +241,7 @@ namespace OpenTween
         }
 
         public static string GetErrorLogPath()
-        {
-            return Path.Combine(Path.GetDirectoryName(MyCommon.EntryAssembly.Location), "ErrorLogs");
-        }
+            => Path.Combine(Path.GetDirectoryName(MyCommon.EntryAssembly.Location), "ErrorLogs");
 
         public static void TraceOut(WebApiException ex)
         {
@@ -262,9 +260,7 @@ namespace OpenTween
         }
 
         public static void TraceOut(string Message)
-        {
-            TraceOut(TraceFlag, Message);
-        }
+            => TraceOut(TraceFlag, Message);
 
         public static void TraceOut(bool OutputFlag, string Message)
         {
@@ -868,9 +864,7 @@ namespace OpenTween
         /// <param name="keys">状態を調べるキー</param>
         /// <returns><paramref name="keys"/> で指定された修飾キーがすべて押されている状態であれば true。それ以外であれば false。</returns>
         public static bool IsKeyDown(params Keys[] keys)
-        {
-            return MyCommon._IsKeyDown(Control.ModifierKeys, keys);
-        }
+            => MyCommon._IsKeyDown(Control.ModifierKeys, keys);
 
         internal static bool _IsKeyDown(Keys modifierKeys, Keys[] targetKeys)
         {
@@ -892,9 +886,7 @@ namespace OpenTween
         /// </remarks>
         /// <returns>アプリケーションのアセンブリ名</returns>
         public static string GetAssemblyName()
-        {
-            return MyCommon.EntryAssembly.GetName().Name;
-        }
+            => MyCommon.EntryAssembly.GetName().Name;
 
         /// <summary>
         /// 文字列中に含まれる %AppName% をアプリケーション名に置換する
@@ -902,9 +894,7 @@ namespace OpenTween
         /// <param name="orig">対象となる文字列</param>
         /// <returns>置換後の文字列</returns>
         public static string ReplaceAppName(string orig)
-        {
-            return MyCommon.ReplaceAppName(orig, ApplicationSettings.ApplicationName);
-        }
+            => MyCommon.ReplaceAppName(orig, ApplicationSettings.ApplicationName);
 
         /// <summary>
         /// 文字列中に含まれる %AppName% をアプリケーション名に置換する
@@ -913,9 +903,7 @@ namespace OpenTween
         /// <param name="appname">アプリケーション名</param>
         /// <returns>置換後の文字列</returns>
         public static string ReplaceAppName(string orig, string appname)
-        {
-            return orig.Replace("%AppName%", appname);
-        }
+            => orig.Replace("%AppName%", appname);
 
         /// <summary>
         /// 表示用のバージョン番号の文字列を生成する
@@ -985,9 +973,7 @@ namespace OpenTween
         }
 
         public static string GetStatusUrl(string screenName, long statusId)
-        {
-            return TwitterUrl + screenName + "/status/" + statusId;
-        }
+            => TwitterUrl + screenName + "/status/" + statusId;
 
         /// <summary>
         /// 指定された IDictionary を元にクエリ文字列を生成します
index 07a32f8..222b828 100644 (file)
@@ -51,9 +51,7 @@ namespace OpenTween
         private long[] addedListIds = new long[0];
 
         public MyLists()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public MyLists(string screenName, TwitterApi twitterApi)
         {
@@ -202,9 +200,7 @@ namespace OpenTween
         }
 
         private void ContextMenuStrip1_Opening(object sender, CancelEventArgs e)
-        {
-            e.Cancel = this.ListsCheckedListBox.SelectedItem == null;
-        }
+            => e.Cancel = this.ListsCheckedListBox.SelectedItem == null;
 
         private async void MenuItemAdd_Click(object sender, EventArgs e)
         {
@@ -255,8 +251,6 @@ namespace OpenTween
         }
 
         private void CloseButton_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
+            => this.Close();
     }
 }
index f4ccc24..09457af 100644 (file)
@@ -89,9 +89,7 @@ namespace OpenTween
         /// <param name="width">アイテムの最小幅。-1 を指定するとデフォルトの幅が使用されます</param>
         /// <returns>設定前の最小幅</returns>
         public static int SetMinTabWidth(TabControl tabControl, int width)
-        {
-            return (int)SendMessage(tabControl.Handle, SendMessageType.TCM_SETMINTABWIDTH, IntPtr.Zero, (IntPtr)width);
-        }
+            => (int)SendMessage(tabControl.Handle, SendMessageType.TCM_SETMINTABWIDTH, IntPtr.Zero, (IntPtr)width);
 
         // 参照: LVITEM structure (Windows)
         // http://msdn.microsoft.com/en-us/library/windows/desktop/bb774760%28v=vs.85%29.aspx
@@ -149,9 +147,7 @@ namespace OpenTween
         /// <param name="listView">対象となる ListView</param>
         /// <returns>成功した場合は true、それ以外の場合は false</returns>
         public static bool SelectAllItems(ListView listView)
-        {
-            return SelectItem(listView, -1 /* all items */);
-        }
+            => SelectItem(listView, -1 /* all items */);
 
         #region "画面ブリンク用"
         public static bool FlashMyWindow(IntPtr hwnd,
@@ -216,15 +212,11 @@ namespace OpenTween
         #region "selection mark"
         // 複数選択時の起点になるアイテム (selection mark) の位置を取得する
         public static int ListView_GetSelectionMark(IntPtr hwndLV)
-        {
-            return SendMessage(hwndLV, SendMessageType.LVM_GETSELECTIONMARK, IntPtr.Zero, IntPtr.Zero).ToInt32();
-        }
+            => SendMessage(hwndLV, SendMessageType.LVM_GETSELECTIONMARK, IntPtr.Zero, IntPtr.Zero).ToInt32();
 
         // 複数選択時の起点になるアイテム (selection mark) を設定する
         public static void ListView_SetSelectionMark(IntPtr hwndLV, int itemIndex)
-        {
-            SendMessage(hwndLV, SendMessageType.LVM_SETSELECTIONMARK, IntPtr.Zero, (IntPtr)itemIndex);
-        }
+            => SendMessage(hwndLV, SendMessageType.LVM_SETSELECTIONMARK, IntPtr.Zero, (IntPtr)itemIndex);
         #endregion
 
         #region "スクリーンセーバー起動中か判定"
index afd7d93..b354259 100644 (file)
@@ -136,26 +136,18 @@ namespace OpenTween
         /// 標準の VScrollBar のスケーリングでは不十分な処理を補います
         /// </summary>
         public static void ScaleChildControl(VScrollBar scrollBar, SizeF factor)
-        {
-            scrollBar.Width = ScaleBy(factor.Width, scrollBar.Width);
-        }
+            => scrollBar.Width = ScaleBy(factor.Width, scrollBar.Width);
 
         /// <summary>
         /// 標準の ImageList のスケーリングでは不十分な処理を補います
         /// </summary>
         public static void ScaleChildControl(ImageList imageList, SizeF factor)
-        {
-            imageList.ImageSize = ScaleBy(factor, imageList.ImageSize);
-        }
+            => imageList.ImageSize = ScaleBy(factor, imageList.ImageSize);
 
         public static Size ScaleBy(SizeF factor, Size size)
-        {
-            return Size.Round(new SizeF(size.Width * factor.Width, size.Height * factor.Height));
-        }
+            => Size.Round(new SizeF(size.Width * factor.Width, size.Height * factor.Height));
 
         public static int ScaleBy(float factor, int size)
-        {
-            return (int)Math.Round(size * factor);
-        }
+            => (int)Math.Round(size * factor);
     }
 }
index 57e9b62..e0d87d3 100644 (file)
@@ -42,7 +42,7 @@ namespace OpenTween
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public new MemoryImage Image
         {
-            get { return this.memoryImage; }
+            get => this.memoryImage;
             set
             {
                 this.memoryImage = value;
@@ -57,7 +57,7 @@ namespace OpenTween
         [DefaultValue(PictureBoxSizeMode.Normal)]
         public new PictureBoxSizeMode SizeMode
         {
-            get { return this.currentSizeMode; }
+            get => this.currentSizeMode;
             set
             {
                 this.currentSizeMode = value;
@@ -92,9 +92,7 @@ namespace OpenTween
         }
 
         private void RestoreSizeMode()
-        {
-            base.SizeMode = this.currentSizeMode;
-        }
+            => base.SizeMode = this.currentSizeMode;
 
         /// <summary>
         /// SetImageFromTask メソッドを連続で呼び出した際に設定される画像が前後するのを防ぐため、
@@ -176,8 +174,6 @@ namespace OpenTween
 
         [EditorBrowsable(EditorBrowsableState.Never)]
         public new void Load(string url)
-        {
-            throw new NotSupportedException();
-        }
+            => throw new NotSupportedException();
     }
 }
index c818039..13eed70 100644 (file)
@@ -37,10 +37,11 @@ namespace OpenTween
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public bool IsPanelInverted
         {
-            get { return _isPanelInverted; }
+            get => this._isPanelInverted;
             set
             {
-                if (_isPanelInverted == value) return;
+                if (_isPanelInverted == value)
+                    return;
                 _isPanelInverted = value;
 
                 // Panel1 と Panel2 の中身を入れ替え
@@ -78,25 +79,19 @@ namespace OpenTween
         /// SplitContainer.Orientation プロパティの設定に応じて、スプリッタが移動する方向の幅を返す。
         /// </summary>
         private int SplitterTotalWidth
-        {
-            get { return (base.Orientation == Orientation.Horizontal) ? base.Height : base.Width; }
-        }
+            => (base.Orientation == Orientation.Horizontal) ? base.Height : base.Width;
 
         /// <summary>
         /// IsPanelInverted プロパティの設定に応じて、SplitContainer.Panel1 または SplitContainer.Panel2 を返す。
         /// </summary>
         public new SplitterPanel Panel1
-        {
-            get { return IsPanelInverted ? base.Panel2 : base.Panel1; }
-        }
+            => IsPanelInverted ? base.Panel2 : base.Panel1;
 
         /// <summary>
         /// IsPanelInverted プロパティの設定に応じて、SplitContainer.Panel1 または SplitContainer.Panel2 を返す。
         /// </summary>
         public new SplitterPanel Panel2
-        {
-            get { return IsPanelInverted ? base.Panel1 : base.Panel2; }
-        }
+            => IsPanelInverted ? base.Panel1 : base.Panel2;
 
         /// <summary>
         /// IsPanelInverted プロパティの設定に応じて、SplitContainer.FixedPanel を返す。
@@ -145,7 +140,7 @@ namespace OpenTween
         /// </summary>
         public new int Panel1MinSize
         {
-            get { return IsPanelInverted ? base.Panel2MinSize : base.Panel1MinSize; }
+            get => IsPanelInverted ? base.Panel2MinSize : base.Panel1MinSize;
             set
             {
                 if (IsPanelInverted)
@@ -160,7 +155,7 @@ namespace OpenTween
         /// </summary>
         public new int Panel2MinSize
         {
-            get { return IsPanelInverted ? base.Panel1MinSize : base.Panel2MinSize; }
+            get => IsPanelInverted ? base.Panel1MinSize : base.Panel2MinSize;
             set
             {
                 if (IsPanelInverted)
@@ -175,7 +170,7 @@ namespace OpenTween
         /// </summary>
         public new bool Panel1Collapsed
         {
-            get { return IsPanelInverted ? base.Panel2Collapsed : base.Panel1Collapsed; }
+            get => IsPanelInverted ? base.Panel2Collapsed : base.Panel1Collapsed;
             set
             {
                 if (IsPanelInverted)
@@ -190,7 +185,7 @@ namespace OpenTween
         /// </summary>
         public new bool Panel2Collapsed
         {
-            get { return IsPanelInverted ? base.Panel1Collapsed : base.Panel2Collapsed; }
+            get => IsPanelInverted ? base.Panel1Collapsed : base.Panel2Collapsed;
             set
             {
                 if (IsPanelInverted)
index f1454c2..8631c67 100644 (file)
@@ -40,9 +40,7 @@ namespace OpenTween
         private string _selUrl;
 
         public OpenURL()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void OK_Button_Click(object sender, EventArgs e)
         {
@@ -65,14 +63,10 @@ namespace OpenTween
         }
 
         public void ClearUrl()
-        {
-            UrlList.Items.Clear();
-        }
+            => this.UrlList.Items.Clear();
 
         public void AddUrl(OpenUrlItem openUrlItem)
-        {
-            UrlList.Items.Add(openUrlItem);
-        }
+            => this.UrlList.Items.Add(openUrlItem);
 
         public string SelectedUrl
         {
@@ -153,9 +147,7 @@ namespace OpenTween
         }
 
         public override string ToString()
-        {
-            return this.Href;
-        }
+            => this.Href;
 
         public string Url { get; }
         public string Href { get; }
index d68c1b3..2d9ea2c 100644 (file)
@@ -72,7 +72,7 @@ namespace OpenTween
         private SearchOptions resultOptoins = null;
         public SearchOptions ResultOptions
         {
-            get { return this.resultOptoins; }
+            get => this.resultOptoins;
             set
             {
                 this.resultOptoins = value;
@@ -104,7 +104,7 @@ namespace OpenTween
         private bool disableNetTabButton = false;
         public bool DisableNewTabButton
         {
-            get { return this.disableNetTabButton; }
+            get => this.disableNetTabButton;
             set
             {
                 this.disableNetTabButton = value;
@@ -113,9 +113,7 @@ namespace OpenTween
         }
 
         public SearchWordDialog()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void Reset()
         {
@@ -129,14 +127,10 @@ namespace OpenTween
         }
 
         private void SearchWordDialog_Shown(object sender, EventArgs e)
-        {
-            ActivateSelectedTabPage();
-        }
+            => this.ActivateSelectedTabPage();
 
         private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            ActivateSelectedTabPage();
-        }
+            => this.ActivateSelectedTabPage();
 
         private void ActivateSelectedTabPage()
         {
index 731b08a..ec95b14 100644 (file)
@@ -40,7 +40,7 @@ namespace OpenTween
     {
         public ErrorReport ErrorReport
         {
-            get { return this._errorReport; }
+            get => this._errorReport;
             set
             {
                 this._errorReport = value;
@@ -50,9 +50,7 @@ namespace OpenTween
         private ErrorReport _errorReport;
 
         public SendErrorReportForm()
-        {
-            this.InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void SendErrorReportForm_Shown(object sender, EventArgs e)
         {
@@ -61,9 +59,7 @@ namespace OpenTween
         }
 
         private void buttonReset_Click(object sender, EventArgs e)
-        {
-            this.ErrorReport.Reset();
-        }
+            => this.ErrorReport.Reset();
 
         private async void buttonSendByMail_Click(object sender, EventArgs e)
         {
@@ -89,16 +85,14 @@ namespace OpenTween
         }
 
         private void buttonNotSend_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-        }
+            => this.DialogResult = DialogResult.Cancel;
     }
 
     public class ErrorReport : NotifyPropertyChangedBase
     {
         public string ReportText
         {
-            get { return this._reportText; }
+            get => this._reportText;
             set
             {
                 this.SetProperty(ref this._reportText, value);
@@ -109,7 +103,7 @@ namespace OpenTween
 
         public bool AnonymousReport
         {
-            get { return this._anonymousReport; }
+            get => this._anonymousReport;
             set
             {
                 this.SetProperty(ref this._anonymousReport, value);
@@ -149,9 +143,7 @@ namespace OpenTween
         }
 
         public void Reset()
-        {
-            this.ReportText = this.originalReportText;
-        }
+            => this.ReportText = this.originalReportText;
 
         public async Task SendByMailAsync()
         {
@@ -164,9 +156,7 @@ namespace OpenTween
         }
 
         public async Task SendByDmAsync()
-        {
-            await this.tw.SendDirectMessage(this.EncodedReportForDM);
-        }
+            => await this.tw.SendDirectMessage(this.EncodedReportForDM);
 
         private void UpdateEncodedReport()
         {
index 5121f11..1f25ba7 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class ActionPanel : SettingPanelBase
     {
         public ActionPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon, SettingLocal settingLocal)
         {
index 658ef3e..a1e7f61 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class BasedPanel : SettingPanelBase
     {
         public BasedPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
@@ -52,9 +50,7 @@ namespace OpenTween.Setting.Panel
         }
 
         public void SaveConfig(SettingCommon settingCommon)
-        {
-            settingCommon.UserAccounts = this.AuthUserCombo.Items.Cast<UserAccount>().ToList();
-        }
+            => settingCommon.UserAccounts = this.AuthUserCombo.Items.Cast<UserAccount>().ToList();
 
         private void AuthClearButton_Click(object sender, EventArgs e)
         {
index 4460b7f..6551811 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class ConnectionPanel : SettingPanelBase
     {
         public ConnectionPanel()
-        {
-            InitializeComponent();
-        }
+            => InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
index d81e3c5..be5cdfe 100644 (file)
@@ -39,9 +39,7 @@ namespace OpenTween.Setting.Panel
     public partial class CooperatePanel : SettingPanelBase
     {
         public CooperatePanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
@@ -78,8 +76,6 @@ namespace OpenTween.Setting.Panel
         }
 
         private void EnableImgAzyobuziNetCheckBox_CheckedChanged(object sender, EventArgs e)
-        {
-            this.ImgAzyobuziNetDisabledInDMCheckBox.Enabled = this.EnableImgAzyobuziNetCheckBox.Checked;
-        }
+            => this.ImgAzyobuziNetDisabledInDMCheckBox.Enabled = this.EnableImgAzyobuziNetCheckBox.Checked;
     }
 }
index 1557ed1..b0b075f 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class FontPanel : SettingPanelBase
     {
         public FontPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingLocal settingLocal)
         {
@@ -98,43 +96,27 @@ namespace OpenTween.Setting.Panel
         }
 
         private void btnListFont_Click(object sender, EventArgs e)
-        {
-            this.ShowFontDialog(this.lblListFont);
-        }
+            => this.ShowFontDialog(this.lblListFont);
 
         private void btnUnread_Click(object sender, EventArgs e)
-        {
-            this.ShowFontDialog(this.lblUnread);
-        }
+            => this.ShowFontDialog(this.lblUnread);
 
         private void btnFav_Click(object sender, EventArgs e)
-        {
-            this.ShowForeColorDialog(this.lblFav);
-        }
+            => this.ShowForeColorDialog(this.lblFav);
 
         private void btnOWL_Click(object sender, EventArgs e)
-        {
-            this.ShowForeColorDialog(this.lblOWL);
-        }
+            => this.ShowForeColorDialog(this.lblOWL);
 
         private void btnRetweet_Click(object sender, EventArgs e)
-        {
-            this.ShowForeColorDialog(this.lblRetweet);
-        }
+            => this.ShowForeColorDialog(this.lblRetweet);
 
         private void btnDetail_Click(object sender, EventArgs e)
-        {
-            this.ShowFontDialog(this.lblDetail);
-        }
+            => this.ShowFontDialog(this.lblDetail);
 
         private void btnDetailLink_Click(object sender, EventArgs e)
-        {
-            this.ShowForeColorDialog(this.lblDetailLink);
-        }
+            => this.ShowForeColorDialog(this.lblDetailLink);
 
         private void btnDetailBack_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblDetailBackcolor);
-        }
+            => this.ShowBackColorDialog(this.lblDetailBackcolor);
     }
 }
index 24be021..fa0f1cd 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class FontPanel2 : SettingPanelBase
     {
         public FontPanel2()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingLocal settingLocal)
         {
@@ -93,48 +91,30 @@ namespace OpenTween.Setting.Panel
         }
 
         private void btnSelf_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblSelf);
-        }
+            => this.ShowBackColorDialog(this.lblSelf);
 
         private void btnAtSelf_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblAtSelf);
-        }
+            => this.ShowBackColorDialog(this.lblAtSelf);
 
         private void btnTarget_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblTarget);
-        }
+            => this.ShowBackColorDialog(this.lblTarget);
 
         private void btnAtTarget_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblAtTarget);
-        }
+            => this.ShowBackColorDialog(this.lblAtTarget);
 
         private void btnAtFromTarget_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblAtFromTarget);
-        }
+            => this.ShowBackColorDialog(this.lblAtFromTarget);
 
         private void btnAtTo_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblAtTo);
-        }
+            => this.ShowBackColorDialog(this.lblAtTo);
 
         private void btnListBack_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblListBackcolor);
-        }
+            => this.ShowBackColorDialog(this.lblListBackcolor);
 
         private void btnInputBackcolor_Click(object sender, EventArgs e)
-        {
-            this.ShowBackColorDialog(this.lblInputBackcolor);
-        }
+            => this.ShowBackColorDialog(this.lblInputBackcolor);
 
         private void btnInputFont_Click(object sender, EventArgs e)
-        {
-            this.ShowFontDialog(this.lblInputFont);
-        }
+            => this.ShowFontDialog(this.lblInputFont);
     }
 }
index e9f3960..48f1ded 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class GetCountPanel : SettingPanelBase
     {
         public GetCountPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
index 3e54a44..49d47f6 100644 (file)
@@ -40,9 +40,7 @@ namespace OpenTween.Setting.Panel
         public event EventHandler<IntervalChangedEventArgs> IntervalChanged;
 
         public GetPeriodPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
index 209bd44..0446b82 100644 (file)
@@ -39,9 +39,7 @@ namespace OpenTween.Setting.Panel
     public partial class NotifyPanel : SettingPanelBase
     {
         public NotifyPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
index 7ce27ed..77b779c 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class PreviewPanel : SettingPanelBase
     {
         public PreviewPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
index fbdf5e7..1cdc734 100644 (file)
@@ -39,9 +39,7 @@ namespace OpenTween.Setting.Panel
     public partial class ProxyPanel : SettingPanelBase
     {
         public ProxyPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingLocal settingLocal)
         {
index dbbf44a..8b5a274 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class SettingPanelBase : UserControl
     {
         public SettingPanelBase()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         protected void ShowFontDialog(Label targetLabel)
         {
index cf96dd0..5174f74 100644 (file)
@@ -40,9 +40,7 @@ namespace OpenTween.Setting.Panel
     public partial class ShortUrlPanel : SettingPanelBase
     {
         public ShortUrlPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
@@ -86,9 +84,7 @@ namespace OpenTween.Setting.Panel
         }
 
         private void CheckAutoConvertUrl_CheckedChanged(object sender, EventArgs e)
-        {
-            ShortenTcoCheck.Enabled = CheckAutoConvertUrl.Checked;
-        }
+            => ShortenTcoCheck.Enabled = CheckAutoConvertUrl.Checked;
 
         private void ButtonBitlyAuthorize_Click(object sender, EventArgs e)
         {
index f50abe8..05e5b07 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class StartupPanel : SettingPanelBase
     {
         public StartupPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
index d618e6b..93115a4 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class TweetActPanel : SettingPanelBase
     {
         public TweetActPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon, SettingLocal settingLocal)
         {
index 4e3c4d1..1055b71 100644 (file)
@@ -38,9 +38,7 @@ namespace OpenTween.Setting.Panel
     public partial class TweetPrvPanel : SettingPanelBase
     {
         public TweetPrvPanel()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public void LoadConfig(SettingCommon settingCommon)
         {
@@ -137,14 +135,10 @@ namespace OpenTween.Setting.Panel
         }
 
         private void CmbDateTimeFormat_TextUpdate(object sender, EventArgs e)
-        {
-            CreateDateTimeFormatSample();
-        }
+            => this.CreateDateTimeFormatSample();
 
         private void CmbDateTimeFormat_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            CreateDateTimeFormatSample();
-        }
+            => this.CreateDateTimeFormatSample();
 
         private void CmbDateTimeFormat_Validating(object sender, CancelEventArgs e)
         {
@@ -156,8 +150,6 @@ namespace OpenTween.Setting.Panel
         }
 
         private void LabelDateTimeFormatApplied_VisibleChanged(object sender, EventArgs e)
-        {
-            CreateDateTimeFormatSample();
-        }
+            => this.CreateDateTimeFormatSample();
     }
 }
index 25f58ab..7b0b5a8 100644 (file)
@@ -41,19 +41,13 @@ namespace OpenTween
         }
 
         public void Save()
-        {
-            SaveSettings(this);
-        }
+            => SaveSettings(this);
 
         public SettingAtIdList()
-        {
-            AtIdList = new List<String>();
-        }
+            => this.AtIdList = new List<String>();
 
         public SettingAtIdList(List<string> ids)
-        {
-            this.AtIdList = ids;
-        }
+            => this.AtIdList = ids;
 #endregion
 
         public List<string> AtIdList;
index fc42b4d..9a5ff71 100644 (file)
@@ -113,9 +113,7 @@ namespace OpenTween
         }
 
         protected static T LoadSettings()
-        {
-            return LoadSettings("");
-        }
+            => LoadSettings("");
 
         protected static void SaveSettings(T instance, string fileId)
         {
@@ -179,13 +177,9 @@ namespace OpenTween
         }
 
         protected static void SaveSettings(T Instance)
-        {
-            SaveSettings(Instance, "");
-        }
+            => SaveSettings(Instance, "");
 
         public static string GetSettingFilePath(string FileId)
-        {
-            return Path.Combine(MyCommon.settingPath, typeof(T).Name + FileId + ".xml");
-        }
+            => Path.Combine(MyCommon.settingPath, typeof(T).Name + FileId + ".xml");
     }
 }
index 33fe841..6ab0998 100644 (file)
@@ -36,14 +36,10 @@ namespace OpenTween
     {
         #region "Settingクラス基本"
         public static SettingCommon Load()
-        {
-            return LoadSettings();
-        }
+            => LoadSettings();
 
         public void Save()
-        {
-            SaveSettings(this);
-        }
+            => SaveSettings(this);
         #endregion
 
         public List<UserAccount> UserAccounts;
@@ -295,9 +291,8 @@ namespace OpenTween
             }
             return password;
         }
+
         public override string ToString()
-        {
-            return this.Username;
-        }
+            => this.Username;
     }
 }
\ No newline at end of file
index 518a424..2a980f9 100644 (file)
@@ -36,17 +36,13 @@ namespace OpenTween
 {
     public class SettingLocal : SettingBase<SettingLocal>, IDisposable
     {
-#region Settingクラス基本
+        #region Settingクラス基本
         public static SettingLocal Load()
-        {
-            return LoadSettings();
-        }
+            => LoadSettings();
 
         public void Save()
-        {
-            SaveSettings(this);
-        }
-#endregion
+            => SaveSettings(this);
+        #endregion
 
         /// <summary>
         /// ウィンドウサイズ等の保存時のDPI
@@ -323,27 +319,19 @@ namespace OpenTween
         private FontConverter fontConverter = new FontConverter();
 
         protected string FontToString(Font font)
-        {
-            return font != null ? this.fontConverter.ConvertToString(font) : null;
-        }
+            => font != null ? this.fontConverter.ConvertToString(font) : null;
 
         protected Font StringToFont(string str)
-        {
-            return str != null ? (Font)this.fontConverter.ConvertFromString(str) : null;
-        }
+            => str != null ? (Font)this.fontConverter.ConvertFromString(str) : null;
 
         [XmlIgnore]
         private ColorConverter colorConverter = new ColorConverter();
 
         protected string ColorToString(Color color)
-        {
-            return this.colorConverter.ConvertToString(color);
-        }
+            => this.colorConverter.ConvertToString(color);
 
         protected Color StringToColor(string str)
-        {
-            return (Color)this.colorConverter.ConvertFromString(str);
-        }
+            => (Color)this.colorConverter.ConvertFromString(str);
 
         /// <summary>
         /// 指定されたスケールと SettingLocal.ScaleDimension のスケールとの拡大比を返します
index 29c8eaa..7f3a3cd 100644 (file)
@@ -37,20 +37,13 @@ namespace OpenTween
     {
 #region Settingクラス基本
         public static SettingTabs Load()
-        {
-            SettingTabs setting = LoadSettings("");
-            return setting;
-        }
+            => LoadSettings("");
 
         public void Save()
-        {
-            SaveSettings(this);
-        }
+            => SaveSettings(this);
 
         public SettingTabs()
-        {
-            Tabs = new List<SettingTabItem>();
-        }
+            => this.Tabs = new List<SettingTabItem>();
 #endregion
 
         public List<SettingTabItem> Tabs;
index dd774fe..a4adaaf 100644 (file)
@@ -51,9 +51,7 @@ namespace OpenTween
         /// ShortUrl のインスタンスを取得します
         /// </summary>
         public static ShortUrl Instance
-        {
-            get { return _instance.Value; }
-        }
+            => _instance.Value;
 
         /// <summary>
         /// 短縮 URL の展開を無効にするか否か
@@ -137,9 +135,7 @@ namespace OpenTween
         };
 
         static ShortUrl()
-        {
-            _instance = new Lazy<ShortUrl>(() => new ShortUrl(), true);
-        }
+            => _instance = new Lazy<ShortUrl>(() => new ShortUrl(), true);
 
         [SuppressMessage("Microsoft.Reliability", "CA2000:DisposeObjectsBeforeLosingScope")]
         internal ShortUrl()
@@ -182,9 +178,7 @@ namespace OpenTween
         /// <param name="uri">展開するURL</param>
         /// <returns>URLの展開を行うタスク</returns>
         public Task<Uri> ExpandUrlAsync(Uri uri)
-        {
-            return this.ExpandUrlAsync(uri, 10);
-        }
+            => this.ExpandUrlAsync(uri, 10);
 
         /// <summary>
         /// 短縮 URL を非同期に展開します
@@ -252,9 +246,7 @@ namespace OpenTween
         /// <param name="uriStr">展開するURL</param>
         /// <returns>URLの展開を行うタスク</returns>
         public Task<string> ExpandUrlAsync(string uriStr)
-        {
-            return this.ExpandUrlAsync(uriStr, 10);
-        }
+            => this.ExpandUrlAsync(uriStr, 10);
 
         /// <summary>
         /// 短縮 URL を非同期に展開します
@@ -289,9 +281,7 @@ namespace OpenTween
 
         [Obsolete]
         public string ExpandUrlHtml(string html)
-        {
-            return this.ExpandUrlHtmlAsync(html, 10).Result;
-        }
+            => this.ExpandUrlHtmlAsync(html, 10).Result;
 
         /// <summary>
         /// HTML内に含まれるリンクのURLを非同期に展開する
@@ -299,9 +289,7 @@ namespace OpenTween
         /// <param name="html">処理対象のHTML</param>
         /// <returns>URLの展開を行うタスク</returns>
         public Task<string> ExpandUrlHtmlAsync(string html)
-        {
-            return this.ExpandUrlHtmlAsync(html, 10);
-        }
+            => this.ExpandUrlHtmlAsync(html, 10);
 
         /// <summary>
         /// HTML内に含まれるリンクのURLを非同期に展開する
index ec08499..ece590a 100644 (file)
@@ -98,26 +98,20 @@ namespace OpenTween
         /// コマンドを実行します
         /// </summary>
         public async Task RunCommand()
-        {
-            await this.command();
-        }
+            => await this.command();
 
         /// <summary>
         /// 新規に ShortcutCommand インスタンスを作成するビルダーを返します
         /// </summary>
         public static ShortcutCommand.Builder Create(params Keys[] shortcuts)
-        {
-            return new Builder().Keys(shortcuts);
-        }
+            => new Builder().Keys(shortcuts);
 
         public class Builder
         {
             private readonly ShortcutCommand instance;
 
             internal Builder()
-            {
-                this.instance = new ShortcutCommand();
-            }
+                => this.instance = new ShortcutCommand();
 
             /// <summary>
             /// 指定されたキーが入力された時にショートカットを発動します
@@ -159,9 +153,7 @@ namespace OpenTween
             /// ショートカットが入力された時に行う動作の内容
             /// </summary>
             public ShortcutCommand Do(Action action, bool preventDefault = true)
-            {
-                return this.Do(SynchronousTask(action), preventDefault);
-            }
+                => this.Do(SynchronousTask(action), preventDefault);
 
             /// <summary>
             /// ショートカットが入力された時に行う動作の内容
@@ -181,9 +173,7 @@ namespace OpenTween
             /// Action を Func&lt;Task&gt; に変換します
             /// </summary>
             private static Func<Task> SynchronousTask(Action action)
-            {
-                return () => { action(); return noOpTask; };
-            }
+                => () => { action(); return noOpTask; };
         }
     }
 }
index 1f17f63..742d555 100644 (file)
@@ -48,9 +48,7 @@ namespace OpenTween
             public string Label { get; set; }
 
             public override string ToString()
-            {
-                return this.Label;
-            }
+                => this.Label;
         }
 
         public TabsDialog(TabInformations tabinformation)
@@ -112,14 +110,9 @@ namespace OpenTween
             => this.TabList.SelectedItem is TabListItem item ? item.Tab : null;
 
         public TabModel[] SelectedTabs
-        {
-            get
-            {
-                return this.TabList.SelectedItems
+            => this.TabList.SelectedItems
                     .Cast<TabListItem>()
                     .Select(x => x.Tab)
                     .ToArray();
-            }
-        }
     }
 }
index 9ed5b58..8bfa2a0 100644 (file)
@@ -47,9 +47,8 @@ namespace OpenTween.Thumbnail.Services
         public static readonly string ApiBase = "https://api.foursquare.com/v2";
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         public FoursquareCheckin()
@@ -58,9 +57,7 @@ namespace OpenTween.Thumbnail.Services
         }
 
         public FoursquareCheckin(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public override async Task<ThumbnailInfo> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {
index a4e0e3a..7f393f9 100644 (file)
@@ -54,9 +54,8 @@ namespace OpenTween.Thumbnail.Services
         protected Timer UpdateTimer;
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         private object LockObj = new object();
@@ -84,7 +83,7 @@ namespace OpenTween.Thumbnail.Services
 
         public bool AutoUpdate
         {
-            get { return this._AutoUpdate; }
+            get => this._AutoUpdate;
             set
             {
                 if (value)
@@ -108,14 +107,10 @@ namespace OpenTween.Thumbnail.Services
         public bool DisabledInDM { get; set; }
 
         protected void StartAutoUpdate()
-        {
-            this.UpdateTimer.Change(0, 30 * 60 * 1000); // 30分おきに更新
-        }
+            => this.UpdateTimer.Change(0, 30 * 60 * 1000); // 30分おきに更新
 
         protected void StopAutoUpdate()
-        {
-            this.UpdateTimer.Change(Timeout.Infinite, Timeout.Infinite);
-        }
+            => this.UpdateTimer.Change(Timeout.Infinite, Timeout.Infinite);
 
         public async Task LoadRegexAsync()
         {
@@ -226,8 +221,6 @@ namespace OpenTween.Thumbnail.Services
         }
 
         public virtual void Dispose()
-        {
-            this.UpdateTimer.Dispose();
-        }
+            => this.UpdateTimer.Dispose();
     }
 }
index 08f31f1..572c730 100644 (file)
@@ -46,9 +46,8 @@ namespace OpenTween.Thumbnail.Services
         protected static string[] PropertyNames = { "og:image", "twitter:image", "twitter:image:src" };
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         protected readonly Regex regex;
index b252c9c..c0c79ae 100644 (file)
@@ -70,9 +70,7 @@ namespace OpenTween.Thumbnail.Services
         }
 
         protected string ReplaceUrl(string url)
-        {
-            return ReplaceUrl(url, this.thumb_replacement);
-        }
+            => this.ReplaceUrl(url, this.thumb_replacement);
 
         protected string ReplaceUrl(string url, string replacement)
         {
index e1eb573..28742a0 100644 (file)
@@ -41,9 +41,8 @@ namespace OpenTween.Thumbnail.Services
             new Regex(@"^https?://www\.tinami\.com/view/(?<ContentId>\d+)$");
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         public Tinami()
@@ -52,9 +51,7 @@ namespace OpenTween.Thumbnail.Services
         }
 
         public Tinami(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public override async Task<ThumbnailInfo> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {
index 039e088..23b9e43 100644 (file)
@@ -42,9 +42,8 @@ namespace OpenTween.Thumbnail.Services
             new Regex(@"^https?://(?<host>[^.]+\.tumblr\.com|tumblr\.[^.]+\.[^.]+)/post/(?<postId>[0-9]+)(/.*)?");
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         public Tumblr()
@@ -53,9 +52,7 @@ namespace OpenTween.Thumbnail.Services
         }
 
         public Tumblr(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public override async Task<ThumbnailInfo> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {
index 84b4cc2..4a0fb0a 100644 (file)
@@ -43,9 +43,8 @@ namespace OpenTween.Thumbnail.Services
             new Regex(@"^https?://via\.me/-(\w+)$");
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         public ViaMe()
@@ -54,9 +53,7 @@ namespace OpenTween.Thumbnail.Services
         }
 
         public ViaMe(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public override async Task<ThumbnailInfo> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {
index 4060a58..ddde8cf 100644 (file)
@@ -43,9 +43,8 @@ namespace OpenTween.Thumbnail.Services
             new Regex(@"https?://vimeo\.com/(?<postID>[0-9]+)");
 
         protected HttpClient http
-        {
-            get { return this.localHttpClient ?? Networking.Http; }
-        }
+            => this.localHttpClient ?? Networking.Http;
+
         private readonly HttpClient localHttpClient;
 
         public Vimeo()
@@ -54,9 +53,7 @@ namespace OpenTween.Thumbnail.Services
         }
 
         public Vimeo(HttpClient http)
-        {
-            this.localHttpClient = http;
-        }
+            => this.localHttpClient = http;
 
         public override async Task<ThumbnailInfo> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {
index da46a06..5de15dc 100644 (file)
@@ -39,9 +39,7 @@ namespace OpenTween.Thumbnail
         internal static ImgAzyobuziNet ImgAzyobuziNetInstance { get; private set; }
 
         static ThumbnailGenerator()
-        {
-            ThumbnailGenerator.Services = new List<IThumbnailService>();
-        }
+            => ThumbnailGenerator.Services = new List<IThumbnailService>();
 
         public static void InitializeGenerator()
         {
index d985549..20d41f8 100644 (file)
@@ -64,14 +64,10 @@ namespace OpenTween.Thumbnail
         public bool IsPlayable { get; set; }
 
         public Task<MemoryImage> LoadThumbnailImageAsync()
-        {
-            return this.LoadThumbnailImageAsync(CancellationToken.None);
-        }
+            => this.LoadThumbnailImageAsync(CancellationToken.None);
 
         public Task<MemoryImage> LoadThumbnailImageAsync(CancellationToken cancellationToken)
-        {
-            return this.LoadThumbnailImageAsync(Networking.Http, cancellationToken);
-        }
+            => this.LoadThumbnailImageAsync(Networking.Http, cancellationToken);
 
         public async virtual Task<MemoryImage> LoadThumbnailImageAsync(HttpClient http, CancellationToken cancellationToken)
         {
@@ -101,9 +97,7 @@ namespace OpenTween.Thumbnail
         }
 
         public override bool Equals(object obj)
-        {
-            return this.Equals(obj as ThumbnailInfo);
-        }
+            => this.Equals(obj as ThumbnailInfo);
 
         public bool Equals(ThumbnailInfo other)
         {
@@ -116,8 +110,6 @@ namespace OpenTween.Thumbnail
         }
 
         public override int GetHashCode()
-        {
-            return this.MediaPageUrl.GetHashCode() ^ this.ThumbnailImageUrl.GetHashCode();
-        }
+            => this.MediaPageUrl.GetHashCode() ^ this.ThumbnailImageUrl.GetHashCode();
     }
 }
index c8f29d9..4aeee81 100644 (file)
@@ -51,7 +51,7 @@ namespace OpenTween
         [RefreshProperties(RefreshProperties.Repaint)]
         public int GaugeHeight
         {
-            get { return this._GaugeHeight; }
+            get => this._GaugeHeight;
             set
             {
                 this._GaugeHeight = value;
@@ -68,7 +68,7 @@ namespace OpenTween
         [Browsable(false)]
         public ApiLimit ApiLimit
         {
-            get { return this._ApiLimit; }
+            get => this._ApiLimit;
             private set
             {
                 this._ApiLimit = value;
@@ -87,7 +87,7 @@ namespace OpenTween
         [Browsable(false)]
         public string ApiEndpoint
         {
-            get { return this._ApiEndpoint; }
+            get => this._ApiEndpoint;
             set
             {
                 if (string.IsNullOrEmpty(value))
index 553baeb..c757167 100644 (file)
@@ -66,9 +66,7 @@ namespace OpenTween.OpenTweenCustomControl
             }
 
             public override string ToString()
-            {
-                return Timestamp.ToLocalTime().ToString("T") + ": " + Summary;
-            }
+                => Timestamp.ToLocalTime().ToString("T") + ": " + Summary;
         }
 
         LinkedList<LogEntry> _logs;
@@ -77,7 +75,7 @@ namespace OpenTween.OpenTweenCustomControl
 
         public override string Text
         {
-            get { return base.Text; }
+            get => base.Text;
             set
             {
                 _logs.AddLast(new LogEntry(DateTimeUtc.Now, value));
@@ -103,8 +101,6 @@ namespace OpenTween.OpenTweenCustomControl
         }
 
         public ToolStripLabelHistory()
-        {
-            _logs = new LinkedList<LogEntry>();
-        }
+            => this._logs = new LinkedList<LogEntry>();
     }
 }
index 25d31e5..6ca60a4 100644 (file)
@@ -2914,25 +2914,17 @@ namespace OpenTween
         }
 
         private async void FavAddToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.FavoriteChange(true);
-        }
+            => await this.FavoriteChange(true);
 
         private async void FavRemoveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.FavoriteChange(false);
-        }
+            => await this.FavoriteChange(false);
 
 
         private async void FavoriteRetweetMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.FavoritesRetweetOfficial();
-        }
+            => await this.FavoritesRetweetOfficial();
 
         private async void FavoriteRetweetUnofficialMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.FavoritesRetweetUnofficial();
-        }
+            => await this.FavoritesRetweetUnofficial();
 
         private async Task FavoriteChange(bool FavAdd, bool multiFavoriteChangeDialogEnable = true)
         {
@@ -3271,14 +3263,10 @@ namespace OpenTween
         }
 
         private void ReplyStripMenuItem_Click(object sender, EventArgs e)
-        {
-            MakeReplyOrDirectStatus(false, true);
-        }
+            => this.MakeReplyOrDirectStatus(false, true);
 
         private void DMStripMenuItem_Click(object sender, EventArgs e)
-        {
-            MakeReplyOrDirectStatus(false, false);
-        }
+            => this.MakeReplyOrDirectStatus(false, false);
 
         private async Task doStatusDelete()
         {
@@ -3407,9 +3395,7 @@ namespace OpenTween
         }
 
         private async void DeleteStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.doStatusDelete();
-        }
+            => await this.doStatusDelete();
 
         private void ReadedStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -3462,9 +3448,7 @@ namespace OpenTween
         }
 
         private async void RefreshStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.DoRefresh();
-        }
+            => await this.DoRefresh();
 
         private async Task DoRefresh()
         {
@@ -4408,14 +4392,10 @@ namespace OpenTween
         }
 
         public void ShowSuplDialog(TextBox owner, AtIdSupplement dialog)
-        {
-            ShowSuplDialog(owner, dialog, 0, "");
-        }
+            => this.ShowSuplDialog(owner, dialog, 0, "");
 
         public void ShowSuplDialog(TextBox owner, AtIdSupplement dialog, int offset)
-        {
-            ShowSuplDialog(owner, dialog, offset, "");
-        }
+            => this.ShowSuplDialog(owner, dialog, offset, "");
 
         public void ShowSuplDialog(TextBox owner, AtIdSupplement dialog, int offset, string startswith)
         {
@@ -4811,9 +4791,7 @@ namespace OpenTween
         /// DetailsListView のための ListViewItem のキャッシュを消去する
         /// </summary>
         private void PurgeListViewItemCache()
-        {
-            Interlocked.Exchange(ref this._listItemCache, null);
-        }
+            => Interlocked.Exchange(ref this._listItemCache, null);
 
         private ListViewItem CreateItem(TabPage Tab, PostClass Post, int Index)
         {
@@ -4899,15 +4877,10 @@ namespace OpenTween
         }
 
         private void MyList_DrawColumnHeader(object sender, DrawListViewColumnHeaderEventArgs e)
-        {
-            e.DrawDefault = true;
-        }
+            => e.DrawDefault = true;
 
         private void MyList_HScrolled(object sender, EventArgs e)
-        {
-            DetailsListView listView = (DetailsListView)sender;
-            listView.Refresh();
-        }
+            => ((DetailsListView)sender).Refresh();
 
         private void MyList_DrawItem(object sender, DrawListViewItemEventArgs e)
         {
@@ -5239,10 +5212,7 @@ namespace OpenTween
         }
 
         private void MenuItemSubSearch_Click(object sender, EventArgs e)
-        {
-            // 検索メニュー
-            this.ShowSearchDialog();
-        }
+            => this.ShowSearchDialog(); // 検索メニュー
 
         private void MenuItemSearchNext_Click(object sender, EventArgs e)
         {
@@ -5499,9 +5469,7 @@ namespace OpenTween
         }
 
         private async void VerUpMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.CheckNewVersion(false);
-        }
+            => await this.CheckNewVersion(false);
 
         private void RunTweenUp()
         {
@@ -5642,9 +5610,7 @@ namespace OpenTween
         }
 
         private Task DispSelectedPost()
-        {
-            return this.DispSelectedPost(false);
-        }
+            => this.DispSelectedPost(false);
 
         private PostClass displayPost = new PostClass();
 
@@ -5688,19 +5654,13 @@ namespace OpenTween
         }
 
         private async void MatomeMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.OpenApplicationWebsite();
-        }
+            => await this.OpenApplicationWebsite();
 
         private async Task OpenApplicationWebsite()
-        {
-            await this.OpenUriInBrowserAsync(ApplicationSettings.WebsiteUrl);
-        }
+            => await this.OpenUriInBrowserAsync(ApplicationSettings.WebsiteUrl);
 
         private async void ShortcutKeyListMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.OpenUriInBrowserAsync(ApplicationSettings.ShortcutKeyUrl);
-        }
+            => await this.OpenUriInBrowserAsync(ApplicationSettings.ShortcutKeyUrl);
 
         private async void ListTab_KeyDown(object sender, KeyEventArgs e)
         {
@@ -7042,9 +7002,7 @@ namespace OpenTween
         }
 
         private void MyList_MouseClick(object sender, MouseEventArgs e)
-        {
-            _anchorFlag = false;
-        }
+            => this._anchorFlag = false;
 
         private void StatusText_Enter(object sender, EventArgs e)
         {
@@ -7392,9 +7350,7 @@ namespace OpenTween
         }
 
         private void ListTab_DoubleClick(object sender, MouseEventArgs e)
-        {
-            TabRename(this.ListTab.SelectedTab.Text, out var _);
-        }
+            => this.TabRename(this.ListTab.SelectedTab.Text, out var _);
 
         private void ListTab_MouseDown(object sender, MouseEventArgs e)
         {
@@ -7768,9 +7724,7 @@ namespace OpenTween
         }
 
         private void ListTab_MouseUp(object sender, MouseEventArgs e)
-        {
-            _tabDrag = false;
-        }
+            => this._tabDrag = false;
 
         private static int iconCnt = 0;
         private static int blinkCnt = 0;
@@ -7866,10 +7820,7 @@ namespace OpenTween
         }
 
         private async void TimerRefreshIcon_Tick(object sender, EventArgs e)
-        {
-            //200ms
-            await this.RefreshTasktrayIcon();
-        }
+            => await this.RefreshTasktrayIcon(); // 200ms
 
         private void ContextMenuTabProperty_Opening(object sender, CancelEventArgs e)
         {
@@ -8239,9 +8190,7 @@ namespace OpenTween
         }
 
         private void ReplyAllStripMenuItem_Click(object sender, EventArgs e)
-        {
-            MakeReplyOrDirectStatus(false, true, true);
-        }
+            => this.MakeReplyOrDirectStatus(false, true, true);
 
         private void IDRuleMenuItem_Click(object sender, EventArgs e)
         {
@@ -8431,15 +8380,12 @@ namespace OpenTween
                 mark = false;
             }
         }
+
         private void CopySTOTMenuItem_Click(object sender, EventArgs e)
-        {
-            this.CopyStot();
-        }
+            => this.CopyStot();
 
         private void CopyURLMenuItem_Click(object sender, EventArgs e)
-        {
-            this.CopyIdUri();
-        }
+            => this.CopyIdUri();
 
         private void SelectAllMenuItem_Click(object sender, EventArgs e)
         {
@@ -8848,14 +8794,10 @@ namespace OpenTween
         }
 
         private void SetStatusLabelUrl()
-        {
-            StatusLabelUrl.Text = GetStatusLabelText();
-        }
+            => this.StatusLabelUrl.Text = this.GetStatusLabelText();
 
         public void SetStatusLabel(string text)
-        {
-            StatusLabel.Text = text;
-        }
+            => this.StatusLabel.Text = text;
 
         private void SetNotifyIconText()
         {
@@ -9073,9 +9015,7 @@ namespace OpenTween
         }
 
         private async void RepliedStatusOpenMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.doRepliedStatusOpen();
-        }
+            => await this.doRepliedStatusOpen();
 
         private void SplitContainer2_Panel2_Resize(object sender, EventArgs e)
         {
@@ -9312,24 +9252,16 @@ namespace OpenTween
         }
 
         private async void TinyURLToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await UrlConvertAsync(MyCommon.UrlConverter.TinyUrl);
-        }
+            => await this.UrlConvertAsync(MyCommon.UrlConverter.TinyUrl);
 
         private async void IsgdToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await UrlConvertAsync(MyCommon.UrlConverter.Isgd);
-        }
+            => await this.UrlConvertAsync(MyCommon.UrlConverter.Isgd);
 
         private async void TwurlnlToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await UrlConvertAsync(MyCommon.UrlConverter.Twurl);
-        }
+            => await this.UrlConvertAsync(MyCommon.UrlConverter.Twurl);
 
         private async void UxnuMenuItem_Click(object sender, EventArgs e)
-        {
-            await UrlConvertAsync(MyCommon.UrlConverter.Uxnu);
-        }
+            => await this.UrlConvertAsync(MyCommon.UrlConverter.Uxnu);
 
         private async void UrlConvertAutoToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -9348,9 +9280,7 @@ namespace OpenTween
         }
 
         private void UrlUndoToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            doUrlUndo();
-        }
+            => this.doUrlUndo();
 
         private void NewPostPopMenuItem_CheckStateChanged(object sender, EventArgs e)
         {
@@ -9810,9 +9740,7 @@ namespace OpenTween
         }
 
         private void ListTab_Selecting(object sender, TabControlCancelEventArgs e)
-        {
-            ListTabSelect(e.TabPage);
-        }
+            => this.ListTabSelect(e.TabPage);
 
         private void SelectListItem(DetailsListView LView, int Index)
         {
@@ -9983,14 +9911,10 @@ namespace OpenTween
         }
 
         private async void GetFollowersAllToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.doGetFollowersMenu();
-        }
+            => await this.doGetFollowersMenu();
 
         private void ReTweetUnofficialStripMenuItem_Click(object sender, EventArgs e)
-        {
-            doReTweetUnofficial();
-        }
+            => this.doReTweetUnofficial();
 
         private async Task doReTweetOfficial(bool isConfirm)
         {
@@ -10050,9 +9974,7 @@ namespace OpenTween
         }
 
         private async void ReTweetStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.doReTweetOfficial(true);
-        }
+            => await this.doReTweetOfficial(true);
 
         private async Task FavoritesRetweetOfficial()
         {
@@ -10135,19 +10057,13 @@ namespace OpenTween
         }
 
         private void UrlMultibyteSplitMenuItem_CheckedChanged(object sender, EventArgs e)
-        {
-            this.urlMultibyteSplit = ((ToolStripMenuItem)sender).Checked;
-        }
+            => this.urlMultibyteSplit = ((ToolStripMenuItem)sender).Checked;
 
         private void PreventSmsCommandMenuItem_CheckedChanged(object sender, EventArgs e)
-        {
-            this.preventSmsCommand = ((ToolStripMenuItem)sender).Checked;
-        }
+            => this.preventSmsCommand = ((ToolStripMenuItem)sender).Checked;
 
         private void UrlAutoShortenMenuItem_CheckedChanged(object sender, EventArgs e)
-        {
-            SettingManager.Common.UrlConvertAuto = ((ToolStripMenuItem)sender).Checked;
-        }
+            => SettingManager.Common.UrlConvertAuto = ((ToolStripMenuItem)sender).Checked;
 
         private void IdeographicSpaceToSpaceMenuItem_Click(object sender, EventArgs e)
         {
@@ -10190,10 +10106,7 @@ namespace OpenTween
         }
 
         private void TweenMain_Deactivate(object sender, EventArgs e)
-        {
-            //画面が非アクティブになったら、発言欄の背景色をデフォルトへ
-            this.StatusText_Leave(StatusText, System.EventArgs.Empty);
-        }
+            => this.StatusText_Leave(StatusText, EventArgs.Empty); // 画面が非アクティブになったら、発言欄の背景色をデフォルトへ
 
         private void TabRenameMenuItem_Click(object sender, EventArgs e)
         {
@@ -10203,14 +10116,10 @@ namespace OpenTween
         }
 
         private async void BitlyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await UrlConvertAsync(MyCommon.UrlConverter.Bitly);
-        }
+            => await this.UrlConvertAsync(MyCommon.UrlConverter.Bitly);
 
         private async void JmpToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await UrlConvertAsync(MyCommon.UrlConverter.Jmp);
-        }
+            => await this.UrlConvertAsync(MyCommon.UrlConverter.Jmp);
 
         private async void ApiUsageInfoMenuItem_Click(object sender, EventArgs e)
         {
@@ -10469,18 +10378,7 @@ namespace OpenTween
         }
 
         private async void OwnStatusMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.doShowUserStatus(tw.Username, false);
-            //if (!string.IsNullOrEmpty(tw.UserInfoXml))
-            //{
-            //    doShowUserStatus(tw.Username, false);
-            //}
-            //else
-            //{
-            //    MessageBox.Show(Properties.Resources.ShowYourProfileText1, "Your status", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    return;
-            //}
-        }
+            => await this.doShowUserStatus(tw.Username, false);
 
         // TwitterIDでない固定文字列を調べる(文字列検証のみ 実際に取得はしない)
         // URLから切り出した文字列を渡す
@@ -10547,10 +10445,8 @@ namespace OpenTween
             }
         }
 
-        private void QuoteStripMenuItem_Click(object sender, EventArgs e) // Handles QuoteStripMenuItem.Click, QtOpMenuItem.Click
-        {
-            doQuoteOfficial();
-        }
+        private void QuoteStripMenuItem_Click(object sender, EventArgs e)
+            => this.doQuoteOfficial();
 
         private async void SearchButton_Click(object sender, EventArgs e)
         {
@@ -10620,10 +10516,7 @@ namespace OpenTween
         }
 
         private async void RefreshMoreStripMenuItem_Click(object sender, EventArgs e)
-        {
-            //もっと前を取得
-            await this.DoRefreshMore();
-        }
+            => await this.DoRefreshMore(); // もっと前を取得
 
         /// <summary>
         /// 指定されたタブのListTabにおける位置を返します
@@ -10739,9 +10632,7 @@ namespace OpenTween
         }
 
         private async void MoveToRTHomeMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.doMoveToRTHome();
-        }
+            => await this.doMoveToRTHome();
 
         private void ListManageUserContextToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -10786,9 +10677,7 @@ namespace OpenTween
         }
 
         private void StatusLabel_DoubleClick(object sender, EventArgs e)
-        {
-            MessageBox.Show(StatusLabel.TextHistory, "Logs", MessageBoxButtons.OK, MessageBoxIcon.None);
-        }
+            => MessageBox.Show(StatusLabel.TextHistory, "Logs", MessageBoxButtons.OK, MessageBoxIcon.None);
 
         private void HashManageMenuItem_Click(object sender, EventArgs e)
         {
@@ -10853,9 +10742,7 @@ namespace OpenTween
         }
 
         private void HashStripSplitButton_ButtonClick(object sender, EventArgs e)
-        {
-            HashToggleMenuItem_Click(null, null);
-        }
+            => this.HashToggleMenuItem_Click(null, null);
 
         public void SetPermanentHashtag(string hashtag)
         {
@@ -10974,14 +10861,10 @@ namespace OpenTween
         }
 
         private void MenuItemTab_DropDownOpening(object sender, EventArgs e)
-        {
-            ContextMenuTabProperty_Opening(sender, null);
-        }
+            => this.ContextMenuTabProperty_Opening(sender, null);
 
         public Twitter TwitterInstance
-        {
-            get { return tw; }
-        }
+            => this.tw;
 
         private void SplitContainer3_SplitterMoved(object sender, SplitterEventArgs e)
         {
@@ -11046,16 +10929,10 @@ namespace OpenTween
         }
 
         private void NotifyIcon1_MouseMove(object sender, MouseEventArgs e)
-        {
-            SetNotifyIconText();
-        }
+            => this.SetNotifyIconText();
 
         private async void UserStatusToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var id = _curPost?.ScreenName ?? "";
-
-            await this.ShowUserStatus(id);
-        }
+            => await this.ShowUserStatus(this._curPost?.ScreenName ?? "");
 
         private async Task doShowUserStatus(string id, bool ShowInputDialog)
         {
@@ -11117,14 +10994,10 @@ namespace OpenTween
         }
 
         internal Task ShowUserStatus(string id, bool ShowInputDialog)
-        {
-            return this.doShowUserStatus(id, ShowInputDialog);
-        }
+            => this.doShowUserStatus(id, ShowInputDialog);
 
         internal Task ShowUserStatus(string id)
-        {
-            return this.doShowUserStatus(id, true);
-        }
+            => this.doShowUserStatus(id, true);
 
         private async void ShowProfileMenuItem_Click(object sender, EventArgs e)
         {
@@ -11218,14 +11091,10 @@ namespace OpenTween
         }
 
         private void SplitContainer2_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            this.MultiLinePullDownMenuItem.PerformClick();
-        }
+            => this.MultiLinePullDownMenuItem.PerformClick();
 
         public PostClass CurPost
-        {
-            get { return _curPost; }
-        }
+            => this._curPost;
 
 #region "画像投稿"
         private void ImageSelectMenuItem_Click(object sender, EventArgs e)
@@ -11268,14 +11137,10 @@ namespace OpenTween
         }
 
         private void ImageSelector_FilePickDialogOpening(object sender, EventArgs e)
-        {
-            this.AllowDrop = false;
-        }
+            => this.AllowDrop = false;
 
         private void ImageSelector_FilePickDialogClosed(object sender, EventArgs e)
-        {
-            this.AllowDrop = true;
-        }
+            => this.AllowDrop = true;
 
         private void ImageSelector_SelectedServiceChanged(object sender, EventArgs e)
         {
@@ -11289,9 +11154,7 @@ namespace OpenTween
         }
 
         private void ImageSelector_VisibleChanged(object sender, EventArgs e)
-        {
-            this.StatusText_TextChanged(null, null);
-        }
+            => this.StatusText_TextChanged(null, null);
 
         /// <summary>
         /// StatusTextでCtrl+Vが押下された時の処理
@@ -11356,9 +11219,7 @@ namespace OpenTween
         }
 
         private void CopyUserIdStripMenuItem_Click(object sender, EventArgs e)
-        {
-            CopyUserId();
-        }
+            => this.CopyUserId();
 
         private void CopyUserId()
         {
@@ -11480,9 +11341,7 @@ namespace OpenTween
         }
 
         private void tw_UserIdChanged()
-        {
-            this.ModifySettingCommon = true;
-        }
+            => this.ModifySettingCommon = true;
 
 #region "Userstream"
         private async void tw_PostDeleted(object sender, PostDeletedEventArgs e)
@@ -11837,9 +11696,7 @@ namespace OpenTween
         }
 
         private async void OpenOwnHomeMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.OpenUriInBrowserAsync(MyCommon.TwitterUrl + tw.Username);
-        }
+            => await this.OpenUriInBrowserAsync(MyCommon.TwitterUrl + tw.Username);
 
         private bool ExistCurrentPost
         {
@@ -11931,9 +11788,7 @@ namespace OpenTween
         }
 
         private void StopRefreshAllMenuItem_CheckedChanged(object sender, EventArgs e)
-        {
-            TimelineRefreshEnableChange(!StopRefreshAllMenuItem.Checked);
-        }
+            => this.TimelineRefreshEnableChange(!StopRefreshAllMenuItem.Checked);
 
         private async Task OpenUserAppointUrl()
         {
@@ -11960,9 +11815,7 @@ namespace OpenTween
         }
 
         private async void OpenUserSpecifiedUrlMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.OpenUserAppointUrl();
-        }
+            => await this.OpenUserAppointUrl();
 
         private async void GrowlHelper_Callback(object sender, GrowlHelper.NotifyCallbackEventArgs e)
         {
@@ -11993,19 +11846,13 @@ namespace OpenTween
         }
 
         private void tweetThumbnail1_ThumbnailLoading(object sender, EventArgs e)
-        {
-            this.SplitContainer3.Panel2Collapsed = false;
-        }
+            => this.SplitContainer3.Panel2Collapsed = false;
 
         private async void tweetThumbnail1_ThumbnailDoubleClick(object sender, ThumbnailDoubleClickEventArgs e)
-        {
-            await this.OpenThumbnailPicture(e.Thumbnail);
-        }
+            => await this.OpenThumbnailPicture(e.Thumbnail);
 
         private async void tweetThumbnail1_ThumbnailImageSearchClick(object sender, ThumbnailImageSearchEventArgs e)
-        {
-            await this.OpenUriInBrowserAsync(e.ImageUrl);
-        }
+            => await this.OpenUriInBrowserAsync(e.ImageUrl);
 
         private async Task OpenThumbnailPicture(ThumbnailInfo thumbnail)
         {
@@ -12015,9 +11862,7 @@ namespace OpenTween
         }
 
         private async void TwitterApiStatusToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.OpenUriInBrowserAsync(Twitter.ServiceAvailabilityStatusUrl);
-        }
+            => await this.OpenUriInBrowserAsync(Twitter.ServiceAvailabilityStatusUrl);
 
         private void PostButton_KeyDown(object sender, KeyEventArgs e)
         {
@@ -12041,29 +11886,19 @@ namespace OpenTween
         }
 
         private void IconSizeNoneToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ChangeListViewIconSize(MyCommon.IconSizes.IconNone);
-        }
+            => this.ChangeListViewIconSize(MyCommon.IconSizes.IconNone);
 
         private void IconSize16ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ChangeListViewIconSize(MyCommon.IconSizes.Icon16);
-        }
+            => this.ChangeListViewIconSize(MyCommon.IconSizes.Icon16);
 
         private void IconSize24ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ChangeListViewIconSize(MyCommon.IconSizes.Icon24);
-        }
+            => this.ChangeListViewIconSize(MyCommon.IconSizes.Icon24);
 
         private void IconSize48ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ChangeListViewIconSize(MyCommon.IconSizes.Icon48);
-        }
+            => this.ChangeListViewIconSize(MyCommon.IconSizes.Icon48);
 
         private void IconSize48_2ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ChangeListViewIconSize(MyCommon.IconSizes.Icon48_2);
-        }
+            => this.ChangeListViewIconSize(MyCommon.IconSizes.Icon48_2);
 
         private void ChangeListViewIconSize(MyCommon.IconSizes iconSize)
         {
index ef2ba02..9f14d4f 100644 (file)
@@ -39,9 +39,7 @@ namespace OpenTween
     public partial class TweenAboutBox : OTBaseForm
     {
         public TweenAboutBox()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         private void TweenAboutBox_Load(object sender, EventArgs e)
         {
@@ -69,13 +67,9 @@ namespace OpenTween
         }
 
         private void OKButton_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
+            => this.Close();
 
         private void TweenAboutBox_Shown(object sender, EventArgs e)
-        {
-            OKButton.Focus();
-        }
+            => this.OKButton.Focus();
     }
 }
index 41e92fa..fcb78b3 100644 (file)
@@ -351,10 +351,7 @@ namespace OpenTween
         /// 指定されたHTMLからリンクを除去します
         /// </summary>
         internal static string StripLinkTagHtml(string html)
-        {
-            // a 要素はネストされていない前提の正規表現パターン
-            return Regex.Replace(html, @"<a[^>]*>(.*?)</a>", "$1");
-        }
+            => Regex.Replace(html, @"<a[^>]*>(.*?)</a>", "$1"); // a 要素はネストされていない前提の正規表現パターン
 
         public async Task DoTranslation()
         {
@@ -417,9 +414,7 @@ namespace OpenTween
         }
 
         protected void RaiseStatusChanged(string statusText)
-        {
-            this.StatusChanged?.Invoke(this, new TweetDetailsViewStatusChengedEventArgs(statusText));
-        }
+            => this.StatusChanged?.Invoke(this, new TweetDetailsViewStatusChengedEventArgs(statusText));
 
         private void TweetDetailsView_FontChanged(object sender, EventArgs e)
         {
@@ -439,14 +434,10 @@ namespace OpenTween
         }
 
         private void UserPicture_MouseEnter(object sender, EventArgs e)
-        {
-            this.UserPicture.Cursor = Cursors.Hand;
-        }
+            => this.UserPicture.Cursor = Cursors.Hand;
 
         private void UserPicture_MouseLeave(object sender, EventArgs e)
-        {
-            this.UserPicture.Cursor = Cursors.Default;
-        }
+            => this.UserPicture.Cursor = Cursors.Default;
 
         private async void PostBrowser_Navigated(object sender, WebBrowserNavigatedEventArgs e)
         {
@@ -541,9 +532,7 @@ namespace OpenTween
         }
 
         private void SourceLinkLabel_MouseLeave(object sender, EventArgs e)
-        {
-            this.RaiseStatusChanged(statusText: "");
-        }
+            => this.RaiseStatusChanged(statusText: "");
 
         #endregion
 
@@ -839,19 +828,13 @@ namespace OpenTween
         }
 
         private async void SearchGoogleContextMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.DoSearchToolStrip(Properties.Resources.SearchItem2Url);
-        }
+            => await this.DoSearchToolStrip(Properties.Resources.SearchItem2Url);
 
         private async void SearchWikipediaContextMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.DoSearchToolStrip(Properties.Resources.SearchItem1Url);
-        }
+            => await this.DoSearchToolStrip(Properties.Resources.SearchItem1Url);
 
         private async void SearchPublicSearchContextMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.DoSearchToolStrip(Properties.Resources.SearchItem4Url);
-        }
+            => await this.DoSearchToolStrip(Properties.Resources.SearchItem4Url);
 
         private void CurrentTabToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -917,10 +900,7 @@ namespace OpenTween
         }
 
         private void SelectionAllContextMenuItem_Click(object sender, EventArgs e)
-        {
-            //発言詳細ですべて選択
-            PostBrowser.Document.ExecCommand("SelectAll", false, null);
-        }
+            => this.PostBrowser.Document.ExecCommand("SelectAll", false, null); // 発言詳細ですべて選択
 
         private async void FollowContextMenuItem_Click(object sender, EventArgs e)
         {
@@ -1021,9 +1001,7 @@ namespace OpenTween
         }
 
         private async void TranslationToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            await this.DoTranslation();
-        }
+            => await this.DoTranslation();
 
         #endregion
 
@@ -1086,8 +1064,6 @@ namespace OpenTween
         public string StatusText { get; }
 
         public TweetDetailsViewStatusChengedEventArgs(string statusText)
-        {
-            this.StatusText = statusText;
-        }
+            => this.StatusText = statusText;
     }
 }
index ca00cc0..1bbdca4 100644 (file)
@@ -35,9 +35,7 @@ namespace OpenTween
         /// テキストから URL を抽出して返します
         /// </summary>
         public static IEnumerable<string> ExtractUrls(string text)
-        {
-            return ExtractUrlEntities(text).Select(x => x.Url);
-        }
+            => ExtractUrlEntities(text).Select(x => x.Url);
 
         /// <summary>
         /// テキストから URL を抽出してエンティティとして返します
index be04a15..fc6f28a 100644 (file)
@@ -153,14 +153,10 @@ namespace OpenTween
         }
 
         private static string FormatHashtagEntity(string targetText, TwitterEntityHashtag entity)
-        {
-            return "<a class=\"hashtag\" href=\"https://twitter.com/search?q=%23" + eu(entity.Text) + "\">" + t(e(targetText)) + "</a>";
-        }
+            => "<a class=\"hashtag\" href=\"https://twitter.com/search?q=%23" + eu(entity.Text) + "\">" + t(e(targetText)) + "</a>";
 
         private static string FormatMentionEntity(string targetText, TwitterEntityMention entity)
-        {
-            return "<a class=\"mention\" href=\"https://twitter.com/" + eu(entity.ScreenName) + "\">" + t(e(targetText)) + "</a>";
-        }
+            => "<a class=\"mention\" href=\"https://twitter.com/" + eu(entity.ScreenName) + "\">" + t(e(targetText)) + "</a>";
 
         // 長いのでエイリアスとして e(...), eu(...), t(...) でエスケープできるようにする
         private static Func<string, string> e = EscapeHtml;
index d985d6e..9448e73 100644 (file)
@@ -49,19 +49,13 @@ namespace OpenTween
         public event EventHandler<ThumbnailImageSearchEventArgs> ThumbnailImageSearchClick;
 
         public ThumbnailInfo Thumbnail
-        {
-            get { return this.pictureBox[this.scrollBar.Value].Tag as ThumbnailInfo; }
-        }
+            => this.pictureBox[this.scrollBar.Value].Tag as ThumbnailInfo;
 
         public TweetThumbnail()
-        {
-            InitializeComponent();
-        }
+            => this.InitializeComponent();
 
         public Task ShowThumbnailAsync(PostClass post)
-        {
-            return this.ShowThumbnailAsync(post, CancellationToken.None);
-        }
+            => this.ShowThumbnailAsync(post, CancellationToken.None);
 
         public async Task ShowThumbnailAsync(PostClass post, CancellationToken cancelToken)
         {
@@ -118,19 +112,13 @@ namespace OpenTween
         }
 
         private string GetImageSearchUriGoogle(string image_uri)
-        {
-            return @"https://www.google.com/searchbyimage?image_url=" + Uri.EscapeDataString(image_uri);
-        }
+            => @"https://www.google.com/searchbyimage?image_url=" + Uri.EscapeDataString(image_uri);
 
         private string GetImageSearchUriSauceNao(string imageUri)
-        {
-            return @"https://saucenao.com/search.php?url=" + Uri.EscapeDataString(imageUri);
-        }
+            => @"https://saucenao.com/search.php?url=" + Uri.EscapeDataString(imageUri);
 
         protected virtual Task<IEnumerable<ThumbnailInfo>> GetThumbailInfoAsync(PostClass post, CancellationToken token)
-        {
-            return ThumbnailGenerator.GetThumbnailsAsync(post, token);
-        }
+            => ThumbnailGenerator.GetThumbnailsAsync(post, token);
 
         /// <summary>
         /// 表示するサムネイルの数を設定する
@@ -304,9 +292,7 @@ namespace OpenTween
         public ThumbnailInfo Thumbnail { get; }
 
         public ThumbnailDoubleClickEventArgs(ThumbnailInfo thumbnail)
-        {
-            this.Thumbnail = thumbnail;
-        }
+            => this.Thumbnail = thumbnail;
     }
 
     public class ThumbnailImageSearchEventArgs : EventArgs
@@ -314,8 +300,6 @@ namespace OpenTween
         public string ImageUrl { get; }
 
         public ThumbnailImageSearchEventArgs(string url)
-        {
-            this.ImageUrl = url;
-        }
+            => this.ImageUrl = url;
     }
 }
index 7c095b5..7a44e39 100644 (file)
@@ -194,17 +194,10 @@ namespace OpenTween
         }
 
         public TwitterApiAccessLevel AccessLevel
-        {
-            get
-            {
-                return MyCommon.TwitterApiInfo.AccessLevel;
-            }
-        }
+            => MyCommon.TwitterApiInfo.AccessLevel;
 
         protected void ResetApiStatus()
-        {
-            MyCommon.TwitterApiInfo.Reset();
-        }
+            => MyCommon.TwitterApiInfo.Reset();
 
         public void ClearAuthInfo()
         {
@@ -473,25 +466,19 @@ namespace OpenTween
         /// 渡された取得件数がWORKERTYPEに応じた取得可能範囲に収まっているか検証する
         /// </summary>
         public static bool VerifyApiResultCount(MyCommon.WORKERTYPE type, int count)
-        {
-            return count >= 20 && count <= GetMaxApiResultCount(type);
-        }
+            => count >= 20 && count <= GetMaxApiResultCount(type);
 
         /// <summary>
         /// 渡された取得件数が更新時の取得可能範囲に収まっているか検証する
         /// </summary>
         public static bool VerifyMoreApiResultCount(int count)
-        {
-            return count >= 20 && count <= 200;
-        }
+            => count >= 20 && count <= 200;
 
         /// <summary>
         /// 渡された取得件数が起動時の取得可能範囲に収まっているか検証する
         /// </summary>
         public static bool VerifyFirstApiResultCount(int count)
-        {
-            return count >= 20 && count <= 200;
-        }
+            => count >= 20 && count <= 200;
 
         /// <summary>
         /// WORKERTYPEに応じた取得可能な最大件数を取得する
@@ -679,9 +666,7 @@ namespace OpenTween
         }
 
         private PostClass CreatePostsFromStatusData(TwitterStatus status)
-        {
-            return CreatePostsFromStatusData(status, false);
-        }
+            => this.CreatePostsFromStatusData(status, false);
 
         private PostClass CreatePostsFromStatusData(TwitterStatus status, bool favTweet)
         {
@@ -2180,14 +2165,10 @@ namespace OpenTween
         }
 
         private void userStream_Started()
-        {
-            this.UserStreamStarted?.Invoke(this, EventArgs.Empty);
-        }
+            => this.UserStreamStarted?.Invoke(this, EventArgs.Empty);
 
         private void userStream_Stopped()
-        {
-            this.UserStreamStopped?.Invoke(this, EventArgs.Empty);
-        }
+            => this.UserStreamStopped?.Invoke(this, EventArgs.Empty);
 
         public bool UserStreamActive
             => this.userStream != null && this.userStream.IsStreamActive;
@@ -2237,9 +2218,7 @@ namespace OpenTween
             private CancellationTokenSource streamCts;
 
             public TwitterUserstream(TwitterApi twitterApi)
-            {
-                this.twitterApi = twitterApi;
-            }
+                => this.twitterApi = twitterApi;
 
             public void Start(bool allAtReplies, string trackwords)
             {
@@ -2391,9 +2370,7 @@ namespace OpenTween
         public long StatusId { get; }
 
         public PostDeletedEventArgs(long statusId)
-        {
-            this.StatusId = statusId;
-        }
+            => this.StatusId = statusId;
     }
 
     public class UserStreamEventReceivedEventArgs : EventArgs
@@ -2401,8 +2378,6 @@ namespace OpenTween
         public Twitter.FormattedEvent EventData { get; }
 
         public UserStreamEventReceivedEventArgs(Twitter.FormattedEvent eventData)
-        {
-            this.EventData = eventData;
-        }
+            => this.EventData = eventData;
     }
 }
index bfa9c54..59ba662 100644 (file)
@@ -59,19 +59,12 @@ namespace OpenTween
         }
 
         private void YesButton_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
+            => this.Close();
 
         private void NoButton_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
+            => this.Close();
 
         private void UpdateDialog_Shown(object sender, EventArgs e)
-        {
-            // デフォルトではテキストが全選択されるため抑制
-            this.TextDetail.SelectionLength = 0;
-        }
+            => this.TextDetail.SelectionLength = 0; // デフォルトではテキストが全選択されるため抑制
     }
 }
index e6fa174..adb975d 100644 (file)
@@ -86,8 +86,6 @@ namespace OpenTween
         public bool isFollowed = false;
 
         public override string ToString()
-        {
-            return this.ScreenName + " / " + this.Name;
-        }
+            => this.ScreenName + " / " + this.Name;
     }
 }
index 352dd9f..422fbcf 100644 (file)
@@ -396,9 +396,7 @@ namespace OpenTween
         }
 
         private void ShowUserInfo_Shown(object sender, EventArgs e)
-        {
-            ButtonClose.Focus();
-        }
+            => this.ButtonClose.Focus();
 
         private async void WebBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e)
         {
@@ -443,19 +441,13 @@ namespace OpenTween
         }
 
         private async void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            await this.mainForm.OpenUriInBrowserAsync("https://support.twitter.com/groups/31-twitter-basics/topics/111-features/articles/268350-x8a8d-x8a3c-x6e08-x307f-x30a2-x30ab-x30a6-x30f3-x30c8-x306b-x3064-x3044-x3066");
-        }
+            => await this.mainForm.OpenUriInBrowserAsync("https://support.twitter.com/groups/31-twitter-basics/topics/111-features/articles/268350-x8a8d-x8a3c-x6e08-x307f-x30a2-x30ab-x30a6-x30f3-x30c8-x306b-x3064-x3044-x3066");
 
         private async void LinkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            await this.mainForm.OpenUriInBrowserAsync("https://support.twitter.com/groups/31-twitter-basics/topics/107-my-profile-account-settings/articles/243055-x516c-x958b-x3001-x975e-x516c-x958b-x30a2-x30ab-x30a6-x30f3-x30c8-x306b-x3064-x3044-x3066");
-        }
+            => await this.mainForm.OpenUriInBrowserAsync("https://support.twitter.com/groups/31-twitter-basics/topics/107-my-profile-account-settings/articles/243055-x516c-x958b-x3001-x975e-x516c-x958b-x30a2-x30ab-x30a6-x30f3-x30c8-x306b-x3064-x3044-x3066");
 
         private async void ButtonSearchPosts_Click(object sender, EventArgs e)
-        {
-            await this.mainForm.AddNewTabForUserTimeline(this._displayUser.ScreenName);
-        }
+            => await this.mainForm.AddNewTabForUserTimeline(this._displayUser.ScreenName);
 
         private async void UserPicture_Click(object sender, EventArgs e)
         {
index 4a992a5..fb14cd5 100644 (file)
@@ -85,19 +85,13 @@ namespace OpenTween
         }
 
         public Task WaitForAsync(Task task)
-        {
-            return this.WaitForAsync(this.ConvertTaskWithValue(task));
-        }
+            => this.WaitForAsync(this.ConvertTaskWithValue(task));
 
         public Task WaitForAsync(IWin32Window owner, Task task)
-        {
-            return this.WaitForAsync(owner, this.ConvertTaskWithValue(task));
-        }
+            => this.WaitForAsync(owner, this.ConvertTaskWithValue(task));
 
         public Task<T> WaitForAsync<T>(Task<T> task)
-        {
-            return this.WaitForAsync(null, task);
-        }
+            => this.WaitForAsync(null, task);
 
         /// <summary>
         /// タスクを待機し、状況に応じて待機中ダイアログを表示します
index a26a4d2..3c77077 100644 (file)
@@ -359,9 +359,7 @@ namespace OpenTween
         }
 
         int WebBrowserAPI.IInternetSecurityManager.GetSecurityId(string pwszUrl, byte[] pbSecurityId, ref uint pcbSecurityId, uint dwReserved)
-        {
-            return WebBrowserAPI.INET_E_DEFAULT_ACTION;
-        }
+            => WebBrowserAPI.INET_E_DEFAULT_ACTION;
 
         int WebBrowserAPI.IInternetSecurityManager.GetSecuritySite(out WebBrowserAPI.IInternetSecurityMgrSite pSite)
         {
@@ -437,18 +435,12 @@ namespace OpenTween
         }
 
         int WebBrowserAPI.IInternetSecurityManager.QueryCustomPolicy(string pwszUrl, ref Guid guidKey, byte ppPolicy, int pcbPolicy, byte pContext, int cbContext, int dwReserved)
-        {
-            return WebBrowserAPI.INET_E_DEFAULT_ACTION;
-        }
+            => WebBrowserAPI.INET_E_DEFAULT_ACTION;
 
         int WebBrowserAPI.IInternetSecurityManager.SetSecuritySite(WebBrowserAPI.IInternetSecurityMgrSite pSite)
-        {
-            return WebBrowserAPI.INET_E_DEFAULT_ACTION;
-        }
+            => WebBrowserAPI.INET_E_DEFAULT_ACTION;
 
         int WebBrowserAPI.IInternetSecurityManager.SetZoneMapping(int dwZone, string lpszPattern, int dwFlags)
-        {
-            return WebBrowserAPI.INET_E_DEFAULT_ACTION;
-        }
+            => WebBrowserAPI.INET_E_DEFAULT_ACTION;
     }
 }