rename to special/standard

microsoft · Apr 27, 2024 · dc874c3 · dc874c3
1 parent ae16a5e
commit dc874c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/cascadia/TerminalSettingsModel/ActionMapSerialization.cpp b/src/cascadia/TerminalSettingsModel/ActionMapSerialization.cpp
@@ -99,18 +99,18 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // { "name": "Custom Copy", "command": "copy", "keys": "ctrl+c" }
         // {                        "command": "copy", "keys": "ctrl+shift+c" }
         // {                        "command": "copy", "keys": "ctrl+ins" }
-        auto toJson = [&actionList](const Model::Command& cmd) {
+        auto toJsonSpecial = [&actionList](const Model::Command& cmd) {
             const auto cmdImpl{ winrt::get_self<implementation::Command>(cmd) };
-            const auto& cmdJsonArray{ cmdImpl->ToJson() };
+            const auto& cmdJsonArray{ cmdImpl->ToJsonSpecial() };
             for (const auto& cmdJson : cmdJsonArray)
             {
                 actionList.append(cmdJson);
             }
         };
 
-        auto toJson2 = [&actionList](const Model::Command& cmd) {
+        auto toJsonStandard = [&actionList](const Model::Command& cmd) {
             const auto cmdImpl{ winrt::get_self<implementation::Command>(cmd) };
-            const auto& cmdJsonArray{ cmdImpl->ToJson2() };
+            const auto& cmdJsonArray{ cmdImpl->ToJsonStandard() };
             for (const auto& cmdJson : cmdJsonArray)
             {
                 actionList.append(cmdJson);
@@ -119,19 +119,19 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         for (const auto& [_, cmd] : _ActionMap)
         {
-            toJson2(cmd);
+            toJsonStandard(cmd);
         }
 
         // Serialize all nested Command objects added in the current layer
         for (const auto& [_, cmd] : _NestedCommands)
         {
-            toJson(cmd);
+            toJsonSpecial(cmd);
         }
 
         // Serialize all iterable Command objects added in the current layer
         for (const auto& cmd : _IterableCommands)
         {
-            toJson(cmd);
+            toJsonSpecial(cmd);
         }
 
         return actionList;

diff --git a/src/cascadia/TerminalSettingsModel/Command.cpp b/src/cascadia/TerminalSettingsModel/Command.cpp
@@ -439,7 +439,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - <none>
     // Return Value:
     // - an array of serialized actions
-    Json::Value Command::ToJson() const
+    Json::Value Command::ToJsonSpecial() const
     {
         Json::Value cmdList{ Json::ValueType::arrayValue };
 
@@ -506,7 +506,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - <none>
     // Return Value:
     // - an array of serialized actions
-    Json::Value Command::ToJson2() const
+    Json::Value Command::ToJsonStandard() const
     {
         Json::Value cmdList{ Json::ValueType::arrayValue };
 

diff --git a/src/cascadia/TerminalSettingsModel/Command.h b/src/cascadia/TerminalSettingsModel/Command.h
@@ -50,8 +50,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         static std::vector<SettingsLoadWarnings> LayerJson(Windows::Foundation::Collections::IMap<winrt::hstring, Model::Command>& commands,
                                                            const Json::Value& json,
                                                            const OriginTag origin);
-        Json::Value ToJson() const;
-        Json::Value ToJson2() const;
+        Json::Value ToJsonSpecial() const;
+        Json::Value ToJsonStandard() const;
 
         bool HasNestedCommands() const;
         bool IsNestedCommand() const noexcept;