ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

DolphinQt: Silence -Wshadow warnings.
This commit is contained in:
skidau 2014-12-12 14:01:19 +11:00
parent aaa2dca554 2997689d08
commit 7ebca647b3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/DolphinQt/GameList/GameGrid.cpp
View File

@ -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;
}

4
Source/Core/DolphinQt/GameList/GameGrid.h
View File

@ -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();