From fe99d4e984c7fad82bfb12e54ebcbd03d1835f55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Dec 2021 17:19:53 +0900
Subject: [PATCH] Standardise parameter naming across all file IO methods

---
 osu.Game/Skinning/SkinModelManager.cs       |  4 ++--
 osu.Game/Stores/RealmArchiveModelManager.cs | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Skinning/SkinModelManager.cs b/osu.Game/Skinning/SkinModelManager.cs
index 059345f9bc..40c280c5c2 100644
--- a/osu.Game/Skinning/SkinModelManager.cs
+++ b/osu.Game/Skinning/SkinModelManager.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Skinning
                             sw.WriteLine(line);
                     }
 
-                    ReplaceFile(item, existingFile, stream, realm);
+                    ReplaceFile(existingFile, stream, realm);
 
                     // can be removed 20220502.
                     if (!ensureIniWasUpdated(item))
@@ -214,7 +214,7 @@ namespace osu.Game.Skinning
                         var oldFile = s.Files.FirstOrDefault(f => f.Filename == filename);
 
                         if (oldFile != null)
-                            ReplaceFile(s, oldFile, streamContent, s.Realm);
+                            ReplaceFile(oldFile, streamContent, s.Realm);
                         else
                             AddFile(s, streamContent, filename, s.Realm);
                     }
diff --git a/osu.Game/Stores/RealmArchiveModelManager.cs b/osu.Game/Stores/RealmArchiveModelManager.cs
index 4efcdd096c..87a27cbbbc 100644
--- a/osu.Game/Stores/RealmArchiveModelManager.cs
+++ b/osu.Game/Stores/RealmArchiveModelManager.cs
@@ -52,10 +52,10 @@ namespace osu.Game.Stores
             item.Realm.Write(() => DeleteFile(item, file, item.Realm));
 
         public void ReplaceFile(TModel item, RealmNamedFileUsage file, Stream contents)
-            => item.Realm.Write(() => ReplaceFile(item, file, contents, item.Realm));
+            => item.Realm.Write(() => ReplaceFile(file, contents, item.Realm));
 
-        public void AddFile(TModel item, Stream stream, string filename)
-            => item.Realm.Write(() => AddFile(item, stream, filename, item.Realm));
+        public void AddFile(TModel item, Stream contents, string filename)
+            => item.Realm.Write(() => AddFile(item, contents, filename, item.Realm));
 
         /// <summary>
         /// Delete a file from within an ongoing realm transaction.
@@ -68,7 +68,7 @@ namespace osu.Game.Stores
         /// <summary>
         /// Replace a file from within an ongoing realm transaction.
         /// </summary>
-        protected void ReplaceFile(TModel model, RealmNamedFileUsage file, Stream contents, Realm realm)
+        protected void ReplaceFile(RealmNamedFileUsage file, Stream contents, Realm realm)
         {
             file.File = realmFileStore.Add(contents, realm);
         }
@@ -76,17 +76,17 @@ namespace osu.Game.Stores
         /// <summary>
         /// Add a file from within an ongoing realm transaction. If the file already exists, it is overwritten.
         /// </summary>
-        protected void AddFile(TModel item, Stream stream, string filename, Realm realm)
+        protected void AddFile(TModel item, Stream contents, string filename, Realm realm)
         {
             var existing = item.Files.FirstOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase));
 
             if (existing != null)
             {
-                ReplaceFile(item, existing, stream, realm);
+                ReplaceFile(existing, contents, realm);
                 return;
             }
 
-            var file = realmFileStore.Add(stream, realm);
+            var file = realmFileStore.Add(contents, realm);
             var namedUsage = new RealmNamedFileUsage(file, filename);
 
             item.Files.Add(namedUsage);