From b1a596a59814135d595dcc786f1a9fae7573a8b1 Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Mon, 23 Aug 2021 08:30:23 +0200
Subject: [PATCH] fix: event naming style in DalamudPluginInterface.cs (closes
#458)
---
Dalamud.Test/LocalizationTests.cs | 2 +-
.../Configuration/Internal/DalamudConfiguration.cs | 6 +++---
Dalamud/Localization.cs | 8 ++++----
Dalamud/Plugin/DalamudPluginInterface.cs | 12 ++++++------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Dalamud.Test/LocalizationTests.cs b/Dalamud.Test/LocalizationTests.cs
index 093affc9a..824d836c1 100644
--- a/Dalamud.Test/LocalizationTests.cs
+++ b/Dalamud.Test/LocalizationTests.cs
@@ -13,7 +13,7 @@ namespace Dalamud.Test
{
var workingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
this.localization = new Localization(workingDir, "dalamud_");
- this.localization.OnLocalizationChanged += code => this.currentLangCode = code;
+ this.localization.LocalizationChanged += code => this.currentLangCode = code;
}
[Fact]
diff --git a/Dalamud/Configuration/Internal/DalamudConfiguration.cs b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
index daf7008dd..c56a31b9d 100644
--- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
@@ -19,7 +19,7 @@ namespace Dalamud.Configuration.Internal
private string configPath;
///
- /// Delegate for the event that occurs when the dalamud configuration is saved.
+ /// Delegate for the event that occurs when the dalamud configuration is saved.
///
/// The current dalamud configuration.
public delegate void DalamudConfigurationSavedDelegate(DalamudConfiguration dalamudConfiguration);
@@ -27,7 +27,7 @@ namespace Dalamud.Configuration.Internal
///
/// Event that occurs when dalamud configuration is saved.
///
- public event DalamudConfigurationSavedDelegate OnDalamudConfigurationSaved;
+ public event DalamudConfigurationSavedDelegate DalamudConfigurationSaved;
///
/// Gets or sets a list of muted works.
@@ -219,7 +219,7 @@ namespace Dalamud.Configuration.Internal
public void Save()
{
File.WriteAllText(this.configPath, JsonConvert.SerializeObject(this, Formatting.Indented));
- this.OnDalamudConfigurationSaved?.Invoke(this);
+ this.DalamudConfigurationSaved?.Invoke(this);
}
}
}
diff --git a/Dalamud/Localization.cs b/Dalamud/Localization.cs
index 5c7255a95..df4ac0189 100644
--- a/Dalamud/Localization.cs
+++ b/Dalamud/Localization.cs
@@ -41,7 +41,7 @@ namespace Dalamud
}
///
- /// Delegate for the event that occurs when the language is changed.
+ /// Delegate for the event that occurs when the language is changed.
///
/// The language code of the new language.
public delegate void LocalizationChangedDelegate(string langCode);
@@ -49,7 +49,7 @@ namespace Dalamud
///
/// Event that occurs when the language is changed.
///
- public event LocalizationChangedDelegate OnLocalizationChanged;
+ public event LocalizationChangedDelegate LocalizationChanged;
///
/// Search the set-up localization data for the provided assembly for the given string key and return it.
@@ -95,7 +95,7 @@ namespace Dalamud
///
public void SetupWithFallbacks()
{
- this.OnLocalizationChanged?.Invoke(FallbackLangCode);
+ this.LocalizationChanged?.Invoke(FallbackLangCode);
Loc.SetupWithFallbacks(this.assembly);
}
@@ -111,7 +111,7 @@ namespace Dalamud
return;
}
- this.OnLocalizationChanged?.Invoke(langCode);
+ this.LocalizationChanged?.Invoke(langCode);
try
{
diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs
index a2ef0fd8d..f8793a4dc 100644
--- a/Dalamud/Plugin/DalamudPluginInterface.cs
+++ b/Dalamud/Plugin/DalamudPluginInterface.cs
@@ -60,8 +60,8 @@ namespace Dalamud.Plugin
this.UiLanguage = "en";
}
- localization.OnLocalizationChanged += this.OnLocalizationChanged;
- configuration.OnDalamudConfigurationSaved += this.OnDalamudConfigurationSaved;
+ localization.LocalizationChanged += this.OnLocalizationChanged;
+ configuration.DalamudConfigurationSaved += this.OnDalamudConfigurationSaved;
}
///
@@ -73,7 +73,7 @@ namespace Dalamud.Plugin
///
/// Event that gets fired when loc is changed
///
- public event LanguageChangedDelegate OnLanguageChanged;
+ public event LanguageChangedDelegate LanguageChanged;
///
/// Gets the reason this plugin was loaded.
@@ -228,14 +228,14 @@ namespace Dalamud.Plugin
{
this.UiBuilder.Dispose();
Service.Get().RemoveChatLinkHandler(this.pluginName);
- Service.Get().OnLocalizationChanged -= this.OnLocalizationChanged;
- Service.Get().OnDalamudConfigurationSaved -= this.OnDalamudConfigurationSaved;
+ Service.Get().LocalizationChanged -= this.OnLocalizationChanged;
+ Service.Get().DalamudConfigurationSaved -= this.OnDalamudConfigurationSaved;
}
private void OnLocalizationChanged(string langCode)
{
this.UiLanguage = langCode;
- this.OnLanguageChanged?.Invoke(langCode);
+ this.LanguageChanged?.Invoke(langCode);
}
private void OnDalamudConfigurationSaved(DalamudConfiguration dalamudConfiguration)