The-Homebrew-Cloud/Lime3DS
2
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2024-12-24 17:01:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

game_list: Make containsAllWords() a non-member function

Browse Source 
This doesn't depend on class state at all, so this can be made internal.
While we're at it, amend the function to take its arguments by const reference.
This commit is contained in:
Lioncash 2018-07-18 16:49:03 -04:00
parent 7f1303a834
commit 6614450da3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/citra_qt/game_list.cpp
View File

@ -166,10 +166,12 @@ GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} {
* @param String containing all words getting checked * @param String containing all words getting checked
* @return true if the haystack contains all words of userinput * @return true if the haystack contains all words of userinput
*/ */
bool GameList::containsAllWords(QString haystack, QString userinput) { static bool ContainsAllWords(const QString& haystack, const QString& userinput) {
QStringList userinput_split = userinput.split(" ", QString::SplitBehavior::SkipEmptyParts); const QStringList userinput_split =
userinput.split(' ', QString::SplitBehavior::SkipEmptyParts);
return std::all_of(userinput_split.begin(), userinput_split.end(), return std::all_of(userinput_split.begin(), userinput_split.end(),
[haystack](QString s) { return haystack.contains(s); }); [&haystack](const QString& s) { return haystack.contains(s); });
} }
// Syncs the expanded state of Game Directories with settings to persist across sessions // Syncs the expanded state of Game Directories with settings to persist across sessions
@ -223,7 +225,7 @@ void GameList::onTextChanged(const QString& newText) {
// The search is case insensitive because of toLower() // The search is case insensitive because of toLower()
// I decided not to use Qt::CaseInsensitive in containsAllWords to prevent // I decided not to use Qt::CaseInsensitive in containsAllWords to prevent
// multiple conversions of edit_filter_text for each game in the gamelist // multiple conversions of edit_filter_text for each game in the gamelist
if (containsAllWords(file_name.append(" ").append(file_title), edit_filter_text) || if (ContainsAllWords(file_name.append(' ').append(file_title), edit_filter_text) ||
(file_programmid.count() == 16 && edit_filter_text.contains(file_programmid))) { (file_programmid.count() == 16 && edit_filter_text.contains(file_programmid))) {
tree_view->setRowHidden(j, folder_index, false); tree_view->setRowHidden(j, folder_index, false);
++result_count; ++result_count;

1
src/citra_qt/game_list.h
View File

@ -115,7 +115,6 @@ private:
void DonePopulating(QStringList watch_list); void DonePopulating(QStringList watch_list);
void RefreshGameDirectory(); void RefreshGameDirectory();
bool containsAllWords(QString haystack, QString userinput);
void PopupContextMenu(const QPoint& menu_location); void PopupContextMenu(const QPoint& menu_location);
void AddGamePopup(QMenu& context_menu, u64 program_id); void AddGamePopup(QMenu& context_menu, u64 program_id);