Fix variable shadowing warnings

dolphin-emu · Nov 21, 2020 · 9efc81a · 9efc81a
1 parent 7840f61
commit 9efc81a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
@@ -1049,10 +1049,10 @@ NetPlayDialog::FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
       RunOnObject(this, [this, &sync_identifier, found] {
         for (int i = 0; i < m_game_list_model.rowCount(QModelIndex()); i++)
         {
-          auto game_file = m_game_list_model.GetGameFile(i);
-          *found = std::min(*found, game_file->CompareSyncIdentifier(sync_identifier));
+          auto file = m_game_list_model.GetGameFile(i);
+          *found = std::min(*found, file->CompareSyncIdentifier(sync_identifier));
           if (*found == NetPlay::SyncIdentifierComparison::SameGame)
-            return game_file;
+            return file;
         }
         return static_cast<std::shared_ptr<const UICommon::GameFile>>(nullptr);
       });

diff --git a/Source/Core/InputCommon/ImageOperations.h b/Source/Core/InputCommon/ImageOperations.h
@@ -32,13 +32,13 @@ struct ImagePixelData
 {
   ImagePixelData() = default;
 
-  explicit ImagePixelData(std::vector<Pixel> image_pixels, u32 width, u32 height)
-      : pixels(std::move(image_pixels)), width(width), height(height)
+  explicit ImagePixelData(std::vector<Pixel> image_pixels, u32 width_, u32 height_)
+      : pixels(std::move(image_pixels)), width(width_), height(height_)
   {
   }
 
-  explicit ImagePixelData(u32 width, u32 height, const Pixel& default_color = Pixel{0, 0, 0, 0})
-      : pixels(width * height, default_color), width(width), height(height)
+  explicit ImagePixelData(u32 width_, u32 height_, const Pixel& default_color = Pixel{0, 0, 0, 0})
+      : pixels(width_ * height_, default_color), width(width_), height(height_)
   {
   }
   std::vector<Pixel> pixels;