summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-07-18 18:55:00 -0700
committerGravatar GitHub2018-07-18 18:55:00 -0700
commit2975f7820e1aaf69e436deb7b1b0920bc1fed494 (patch)
treee4833b52f61b2e9bf8cf55e3132ae02cb7471c4e /src
parentVirtual Filesystem 2: Electric Boogaloo (#676) (diff)
parentgame_list: Make ContainsAllWords an internally linked non-member function (diff)
downloadyuzu-2975f7820e1aaf69e436deb7b1b0920bc1fed494.tar.gz
yuzu-2975f7820e1aaf69e436deb7b1b0920bc1fed494.tar.xz
yuzu-2975f7820e1aaf69e436deb7b1b0920bc1fed494.zip
Merge pull request #684 from lioncash/nonmember
game_list: Make ContainsAllWords an internally linked non-member function
Diffstat (limited to '')
-rw-r--r--src/yuzu/game_list.cpp2
-rw-r--r--src/yuzu/game_list.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index 352bc1839..e1ca0e77b 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -139,7 +139,7 @@ GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} {
139 * @param userinput String containing all words getting checked 139 * @param userinput String containing all words getting checked
140 * @return true if the haystack contains all words of userinput 140 * @return true if the haystack contains all words of userinput
141 */ 141 */
142bool GameList::ContainsAllWords(const QString& haystack, const QString& userinput) const { 142static bool ContainsAllWords(const QString& haystack, const QString& userinput) {
143 const QStringList userinput_split = 143 const QStringList userinput_split =
144 userinput.split(' ', QString::SplitBehavior::SkipEmptyParts); 144 userinput.split(' ', QString::SplitBehavior::SkipEmptyParts);
145 145
diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h
index 14db3956d..3bc14f07f 100644
--- a/src/yuzu/game_list.h
+++ b/src/yuzu/game_list.h
@@ -89,7 +89,6 @@ private:
89 89
90 void PopupContextMenu(const QPoint& menu_location); 90 void PopupContextMenu(const QPoint& menu_location);
91 void RefreshGameDirectory(); 91 void RefreshGameDirectory();
92 bool ContainsAllWords(const QString& haystack, const QString& userinput) const;
93 92
94 SearchField* search_field; 93 SearchField* search_field;
95 GMainWindow* main_window = nullptr; 94 GMainWindow* main_window = nullptr;