event, delegate に対するnullableアノテーションを追加

diff --git a/OpenTween/Api/TwitterApiStatus.cs b/OpenTween/Api/TwitterApiStatus.cs
index 5647541..628265b 100644 (file)
--- a/OpenTween/Api/TwitterApiStatus.cs
+++ b/OpenTween/Api/TwitterApiStatus.cs
@@ -49,7 +49,7 @@ namespace OpenTween.Api
             public AccessLimitUpdatedEventArgs(string? endpointName)
                 => this.EndpointName = endpointName;
         }
-        public event EventHandler<AccessLimitUpdatedEventArgs> AccessLimitUpdated;
+        public event EventHandler<AccessLimitUpdatedEventArgs>? AccessLimitUpdated;
 
         public TwitterApiStatus()
             => this.AccessLimit = new EndpointLimits(this);

diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs
index 70838a6..b7dc66b 100644 (file)
--- a/OpenTween/AppendSettingDialog.cs
+++ b/OpenTween/AppendSettingDialog.cs
@@ -48,7 +48,7 @@ namespace OpenTween
 {
     public partial class AppendSettingDialog : OTBaseForm
     {
-        public event EventHandler<IntervalChangedEventArgs> IntervalChanged;
+        public event EventHandler<IntervalChangedEventArgs>? IntervalChanged;
 
         internal Twitter tw = null!;
         internal TwitterApi twitterApi = null!;

diff --git a/OpenTween/Connection/Networking.cs b/OpenTween/Connection/Networking.cs
index 1ae37f0..a22d04b 100644 (file)
--- a/OpenTween/Connection/Networking.cs
+++ b/OpenTween/Connection/Networking.cs
@@ -84,7 +84,7 @@ namespace OpenTween.Connection
         /// <summary>
         /// Webプロキシの設定が変更された場合に発生します
         /// </summary>
-        public static event EventHandler WebProxyChanged;
+        public static event EventHandler? WebProxyChanged;
 
         private static bool initialized = false;
         private static HttpClient globalHttpClient;

diff --git a/OpenTween/DetailsListView.cs b/OpenTween/DetailsListView.cs
index 9aae3df..393d775 100644 (file)
--- a/OpenTween/DetailsListView.cs
+++ b/OpenTween/DetailsListView.cs
@@ -44,8 +44,8 @@ namespace OpenTween.OpenTweenCustomControl
 
         public ContextMenuStrip? ColumnHeaderContextMenuStrip { get; set; }
 
-        public event EventHandler VScrolled;
-        public event EventHandler HScrolled;
+        public event EventHandler? VScrolled;
+        public event EventHandler? HScrolled;
 
         public DetailsListView()
         {

diff --git a/OpenTween/Growl.cs b/OpenTween/Growl.cs
index fe0f104..70efc4d 100644 (file)
--- a/OpenTween/Growl.cs
+++ b/OpenTween/Growl.cs
@@ -69,7 +69,7 @@ namespace OpenTween
             }
         }
 
-        public event EventHandler<NotifyCallbackEventArgs> NotifyClicked;
+        public event EventHandler<NotifyCallbackEventArgs>? NotifyClicked;
 
         public string AppName { get; }
 

diff --git a/OpenTween/HookGlobalHotkey.cs b/OpenTween/HookGlobalHotkey.cs
index a53f517..e7c36da 100644 (file)
--- a/OpenTween/HookGlobalHotkey.cs
+++ b/OpenTween/HookGlobalHotkey.cs
@@ -61,7 +61,7 @@ namespace OpenTween
             Win = 0x8,
         }
 
-        public event KeyEventHandler HotkeyPressed;
+        public event KeyEventHandler? HotkeyPressed;
 
         protected override void WndProc(ref Message m)
         {

diff --git a/OpenTween/ImageListViewItem.cs b/OpenTween/ImageListViewItem.cs
index b109e17..65cfe65 100644 (file)
--- a/OpenTween/ImageListViewItem.cs
+++ b/OpenTween/ImageListViewItem.cs
@@ -51,7 +51,7 @@ namespace OpenTween
         private readonly WeakReference imageReference = new WeakReference(null);
         private Task? imageTask = null;
 
-        public event EventHandler ImageDownloaded;
+        public event EventHandler? ImageDownloaded;
 
         public ImageListViewItem(string[] items)
             : this(items, null, null)

diff --git a/OpenTween/LRUCacheDictionary.cs b/OpenTween/LRUCacheDictionary.cs
index f5078fb..5c82920 100644 (file)
--- a/OpenTween/LRUCacheDictionary.cs
+++ b/OpenTween/LRUCacheDictionary.cs
@@ -58,7 +58,7 @@ namespace OpenTween
             public CacheRemovedEventArgs(KeyValuePair<TKey, TValue> item)
                 => this.Item = item;
         }
-        public event EventHandler<CacheRemovedEventArgs> CacheRemoved;
+        public event EventHandler<CacheRemovedEventArgs>? CacheRemoved;
 
         internal LinkedList<KeyValuePair<TKey, TValue>> innerList;
         internal Dictionary<TKey, LinkedListNode<KeyValuePair<TKey, TValue>>> innerDict;

diff --git a/OpenTween/MediaSelector.cs b/OpenTween/MediaSelector.cs
index 570dabc..f864743 100644 (file)
--- a/OpenTween/MediaSelector.cs
+++ b/OpenTween/MediaSelector.cs
@@ -39,13 +39,13 @@ namespace OpenTween
 {
     public partial class MediaSelector : UserControl
     {
-        public event EventHandler<EventArgs> BeginSelecting;
-        public event EventHandler<EventArgs> EndSelecting;
+        public event EventHandler<EventArgs>? BeginSelecting;
+        public event EventHandler<EventArgs>? EndSelecting;
 
-        public event EventHandler<EventArgs> FilePickDialogOpening;
-        public event EventHandler<EventArgs> FilePickDialogClosed;
+        public event EventHandler<EventArgs>? FilePickDialogOpening;
+        public event EventHandler<EventArgs>? FilePickDialogClosed;
 
-        public event EventHandler<EventArgs> SelectedServiceChanged;
+        public event EventHandler<EventArgs>? SelectedServiceChanged;
 
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]

diff --git a/OpenTween/NotifyPropertyChangedBase.cs b/OpenTween/NotifyPropertyChangedBase.cs
index 7cf65b4..f75ea7e 100644 (file)
--- a/OpenTween/NotifyPropertyChangedBase.cs
+++ b/OpenTween/NotifyPropertyChangedBase.cs
@@ -36,7 +36,7 @@ namespace OpenTween
     /// </summary>
     public class NotifyPropertyChangedBase : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
         {

diff --git a/OpenTween/Setting/Panel/GetPeriodPanel.cs b/OpenTween/Setting/Panel/GetPeriodPanel.cs
index 2c2cae5..fb0d496 100644 (file)
--- a/OpenTween/Setting/Panel/GetPeriodPanel.cs
+++ b/OpenTween/Setting/Panel/GetPeriodPanel.cs
@@ -39,7 +39,7 @@ namespace OpenTween.Setting.Panel
 {
     public partial class GetPeriodPanel : SettingPanelBase
     {
-        public event EventHandler<IntervalChangedEventArgs> IntervalChanged;
+        public event EventHandler<IntervalChangedEventArgs>? IntervalChanged;
 
         public GetPeriodPanel()
             => this.InitializeComponent();

diff --git a/OpenTween/Thumbnail/Services/TonTwitterCom.cs b/OpenTween/Thumbnail/Services/TonTwitterCom.cs
index 2657876..5c45da4 100644 (file)
--- a/OpenTween/Thumbnail/Services/TonTwitterCom.cs
+++ b/OpenTween/Thumbnail/Services/TonTwitterCom.cs
@@ -40,7 +40,7 @@ namespace OpenTween.Thumbnail.Services
     /// </summary>
     class TonTwitterCom : IThumbnailService
     {
-        internal static Func<IApiConnection> GetApiConnection;
+        internal static Func<IApiConnection>? GetApiConnection;
 
         public override Task<ThumbnailInfo?> GetThumbnailInfoAsync(string url, PostClass post, CancellationToken token)
         {
@@ -68,7 +68,7 @@ namespace OpenTween.Thumbnail.Services
             {
                 return Task.Run(async () =>
                 {
-                    var apiConnection = TonTwitterCom.GetApiConnection();
+                    var apiConnection = TonTwitterCom.GetApiConnection!();
 
                     using var imageStream = await apiConnection.GetStreamAsync(new Uri(this.ThumbnailImageUrl), null)
                         .ConfigureAwait(false);

diff --git a/OpenTween/TweetDetailsView.cs b/OpenTween/TweetDetailsView.cs
index b005bcb..ec33d6d 100644 (file)
--- a/OpenTween/TweetDetailsView.cs
+++ b/OpenTween/TweetDetailsView.cs
@@ -66,7 +66,7 @@ namespace OpenTween
         }
 
         /// <summary>ステータスバーに表示するテキストの変化を通知するイベント</summary>
-        public event EventHandler<TweetDetailsViewStatusChengedEventArgs> StatusChanged;
+        public event EventHandler<TweetDetailsViewStatusChengedEventArgs>? StatusChanged;
 
         /// <summary><see cref="ContextMenuPostBrowser"/> 展開時の <see cref="PostBrowser"/>.StatusText を保持するフィールド</summary>
         private string _postBrowserStatusText = "";

diff --git a/OpenTween/TweetThumbnail.cs b/OpenTween/TweetThumbnail.cs
index b4df43f..0a25536 100644 (file)
--- a/OpenTween/TweetThumbnail.cs
+++ b/OpenTween/TweetThumbnail.cs
@@ -46,9 +46,9 @@ namespace OpenTween
         protected internal List<OTPictureBox> pictureBox = new List<OTPictureBox>();
         protected MouseWheelMessageFilter filter = new MouseWheelMessageFilter();
 
-        public event EventHandler<EventArgs> ThumbnailLoading;
-        public event EventHandler<ThumbnailDoubleClickEventArgs> ThumbnailDoubleClick;
-        public event EventHandler<ThumbnailImageSearchEventArgs> ThumbnailImageSearchClick;
+        public event EventHandler<EventArgs>? ThumbnailLoading;
+        public event EventHandler<ThumbnailDoubleClickEventArgs>? ThumbnailDoubleClick;
+        public event EventHandler<ThumbnailImageSearchEventArgs>? ThumbnailImageSearchClick;
 
         public ThumbnailInfo Thumbnail
             => (ThumbnailInfo)this.pictureBox[this.scrollBar.Value].Tag;

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 64a46ec..b9aa67a 100644 (file)
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -1877,11 +1877,11 @@ namespace OpenTween
         public string TrackWord { get; set; } = "";
         public bool AllAtReply { get; set; } = false;
 
-        public event EventHandler NewPostFromStream;
-        public event EventHandler UserStreamStarted;
-        public event EventHandler UserStreamStopped;
-        public event EventHandler<PostDeletedEventArgs> PostDeleted;
-        public event EventHandler<UserStreamEventReceivedEventArgs> UserStreamEventReceived;
+        public event EventHandler? NewPostFromStream;
+        public event EventHandler? UserStreamStarted;
+        public event EventHandler? UserStreamStopped;
+        public event EventHandler<PostDeletedEventArgs>? PostDeleted;
+        public event EventHandler<UserStreamEventReceivedEventArgs>? UserStreamEventReceived;
         private DateTimeUtc _lastUserstreamDataReceived;
         private StreamAutoConnector? userStreamConnector;