From 6f6b88ec2f785ff3ef8c2e56b6c4134df54d345a Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:27:01 -0700
Subject: [PATCH] Rename EditorSettingsOriginTracker

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 .../Editor/Settings/EditorSettingsOriginTracker.cpp    | 10 +++++-----
 .../Editor/Settings/EditorSettingsOriginTracker.h      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.cpp
index 13a0610f5c..bdeb4e41b4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.cpp
@@ -13,7 +13,7 @@
 
 namespace AzToolsFramework
 {
-    EditorPreferencesSettingsOriginTracker::SettingsNotificationHandler::SettingsNotificationHandler(
+    EditorSettingsOriginTracker::SettingsNotificationHandler::SettingsNotificationHandler(
         AZ::SettingsRegistryInterface& registry)
         : m_settingsRegistry(registry)
     {
@@ -33,7 +33,7 @@ namespace AzToolsFramework
         m_settingsRegistry.SetApplyPatchSettings(applyPatchSettings);
     }
 
-    EditorPreferencesSettingsOriginTracker::SettingsNotificationHandler::~SettingsNotificationHandler()
+    EditorSettingsOriginTracker::SettingsNotificationHandler::~SettingsNotificationHandler()
     {
         // Restore previous reporting callback
         AZ::JsonApplyPatchSettings applyPatchSettings;
@@ -44,7 +44,7 @@ namespace AzToolsFramework
 
     // Use the Json Serialization Issue Callback system
     // to determine when a merge option modifies a value
-    AZ::JsonSerializationResult::ResultCode EditorPreferencesSettingsOriginTracker::SettingsNotificationHandler::operator()(
+    AZ::JsonSerializationResult::ResultCode EditorSettingsOriginTracker::SettingsNotificationHandler::operator()(
         AZStd::string_view /*message*/, AZ::JsonSerializationResult::ResultCode result, AZStd::string_view path)
     {
         using FixedValueString = AZ::SettingsRegistryInterface::FixedValueString;
@@ -65,7 +65,7 @@ namespace AzToolsFramework
         return result;
     }
 
-    void EditorPreferencesSettingsOriginTracker::SettingsNotificationHandler::operator()(
+    void EditorSettingsOriginTracker::SettingsNotificationHandler::operator()(
         AZStd::string_view path, AZ::SettingsRegistryInterface::Type /*type*/)
     {
         constexpr AZ::IO::PathView preferencesRootKey{ "/Amazon/Preferences", AZ::IO::PosixPathSeparator };
@@ -76,7 +76,7 @@ namespace AzToolsFramework
         }
     }
 
-    EditorPreferencesSettingsOriginTracker::EditorPreferencesSettingsOriginTracker(AZ::SettingsRegistryInterface& registry)
+    EditorSettingsOriginTracker::EditorSettingsOriginTracker(AZ::SettingsRegistryInterface& registry)
         : m_settingsRegistry(registry)
     {
         auto PreMergeEvent = [this](AZStd::string_view filePath, AZStd::string_view /*rootKey*/)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.h
index 63249a8ecd..3ef3f141a2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Editor/Settings/EditorSettingsOriginTracker.h
@@ -12,9 +12,9 @@
 
 namespace AzToolsFramework
 {
-    struct EditorPreferencesSettingsOriginTracker
+    struct EditorSettingsOriginTracker
     {
-        explicit EditorPreferencesSettingsOriginTracker(AZ::SettingsRegistryInterface& registry);
+        explicit EditorSettingsOriginTracker(AZ::SettingsRegistryInterface& registry);
 
         struct SettingsNotificationHandler
         {