Merge pull request #1679 from rohit-n/shadow-qt

DolphinQt: Silence -Wshadow warnings.

2 files changed, 12 insertions, 12 deletions

diff --git a/Source/Core/DolphinQt/GameList/GameGrid.cpp b/Source/Core/DolphinQt/GameList/GameGrid.cpp
index 408fba7b03..a326c21d21 100644
--- a/Source/Core/DolphinQt/GameList/GameGrid.cpp
+++ b/Source/Core/DolphinQt/GameList/GameGrid.cpp
@@ -67,29 +67,29 @@ void DGameGrid::SetViewStyle(GameListStyle newStyle)
 	setDragEnabled(false);
 }
 
-void DGameGrid::AddGame(GameFile* item)
+void DGameGrid::AddGame(GameFile* gameItem)
 {
-	if (m_items.values().contains(item))
+	if (m_items.values().contains(gameItem))
 		return;
-	m_items.values().append(item);
+	m_items.values().append(gameItem);
 
 	QListWidgetItem* i = new QListWidgetItem;
-	i->setIcon(QIcon(item->GetBitmap()
+	i->setIcon(QIcon(gameItem->GetBitmap()
 		.scaled(GRID_BANNER_WIDTH, GRID_BANNER_HEIGHT, Qt::KeepAspectRatio, Qt::SmoothTransformation)));
-	i->setText(item->GetName(0));
-	if (item->IsCompressed())
+	i->setText(gameItem->GetName(0));
+	if (gameItem->IsCompressed())
 		i->setTextColor(QColor("#00F"));
 
 	addItem(i);
-	m_items.insert(i, item);
+	m_items.insert(i, gameItem);
 }
 
-void DGameGrid::RemoveGame(GameFile* item)
+void DGameGrid::RemoveGame(GameFile* gameItem)
 {
-	if (!m_items.values().contains(item))
+	if (!m_items.values().contains(gameItem))
 		return;
 
-	QListWidgetItem* i = m_items.key(item);
+	QListWidgetItem* i = m_items.key(gameItem);
 	m_items.remove(i);
 	delete i;
 }
diff --git a/Source/Core/DolphinQt/GameList/GameGrid.h b/Source/Core/DolphinQt/GameList/GameGrid.h
index 2c89ef94c4..0d49e3ccf3 100644
--- a/Source/Core/DolphinQt/GameList/GameGrid.h
+++ b/Source/Core/DolphinQt/GameList/GameGrid.h
@@ -30,8 +30,8 @@ public:
 
 	virtual void SetViewStyle(GameListStyle newStyle);
 
-	virtual void AddGame(GameFile* item);
-	virtual void RemoveGame(GameFile* item);
+	virtual void AddGame(GameFile* gameItem);
+	virtual void RemoveGame(GameFile* gameItem);
 
 signals:
 	void StartGame();