midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4131 from FearlessTobi/port-943

Browse Source 
Port #943 from yuzu: "game_list: Join declarations and assignments in onTextChanged()"
This commit is contained in:
Merry 2018-08-24 18:54:31 +01:00 committed by GitHub
commit 702ca755b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/citra_qt/game_list.cpp
View File

@ -185,9 +185,7 @@ void GameList::onTextChanged(const QString& newText) {
int folderCount = tree_view->model()->rowCount(); int folderCount = tree_view->model()->rowCount();
QString edit_filter_text = newText.toLower(); QString edit_filter_text = newText.toLower();
QStandardItem* folder; QStandardItem* folder;
QStandardItem* child;
int childrenTotal = 0; int childrenTotal = 0;
QModelIndex root_index = item_model->invisibleRootItem()->index();
// If the searchfield is empty every item is visible // If the searchfield is empty every item is visible
// Otherwise the filter gets applied // Otherwise the filter gets applied
@ -203,7 +201,6 @@ void GameList::onTextChanged(const QString& newText) {
} }
search_field->setFilterResult(childrenTotal, childrenTotal); search_field->setFilterResult(childrenTotal, childrenTotal);
} else { } else {
QString file_path, file_name, file_title, file_programmid;
int result_count = 0; int result_count = 0;
for (int i = 0; i < folderCount; ++i) { for (int i = 0; i < folderCount; ++i) {
folder = item_model->item(i, 0); folder = item_model->item(i, 0);
@ -211,11 +208,14 @@ void GameList::onTextChanged(const QString& newText) {
int childrenCount = folder->rowCount(); int childrenCount = folder->rowCount();
for (int j = 0; j < childrenCount; ++j) { for (int j = 0; j < childrenCount; ++j) {
++childrenTotal; ++childrenTotal;
child = folder->child(j, 0); const QStandardItem* child = folder->child(j, 0);
file_path = child->data(GameListItemPath::FullPathRole).toString().toLower(); const QString file_path =
file_name = file_path.mid(file_path.lastIndexOf("/") + 1); child->data(GameListItemPath::FullPathRole).toString().toLower();
file_title = child->data(GameListItemPath::TitleRole).toString().toLower(); QString file_name = file_path.mid(file_path.lastIndexOf("/") + 1);
file_programmid = child->data(GameListItemPath::ProgramIdRole).toString().toLower(); const QString file_title =
child->data(GameListItemPath::TitleRole).toString().toLower();
const QString file_programmid =
child->data(GameListItemPath::ProgramIdRole).toString().toLower();
// Only items which filename in combination with its title contains all words // Only items which filename in combination with its title contains all words
// that are in the searchfield will be visible in the gamelist // that are in the searchfield will be visible in the gamelist