Explorar o código

Merge pull request #681 from lioncash/const

 game_list: Make containsAllWords a const member function
bunnei %!s(int64=8) %!d(string=hai) anos
pai
achega
3d1e8f750c
Modificáronse 2 ficheiros con 7 adicións e 5 borrados
  1. 6 4
      src/yuzu/game_list.cpp
  2. 1 1
      src/yuzu/game_list.h

+ 6 - 4
src/yuzu/game_list.cpp

@@ -138,10 +138,12 @@ GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} {
  * @param userinput String containing all words getting checked
  * @return true if the haystack contains all words of userinput
  */
-bool GameList::containsAllWords(QString haystack, QString userinput) {
-    QStringList userinput_split = userinput.split(" ", QString::SplitBehavior::SkipEmptyParts);
+bool GameList::ContainsAllWords(const QString& haystack, const QString& userinput) const {
+    const QStringList userinput_split =
+        userinput.split(' ', QString::SplitBehavior::SkipEmptyParts);
+
     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); });
 }
 
 // Event in order to filter the gamelist after editing the searchfield
@@ -175,7 +177,7 @@ void GameList::onTextChanged(const QString& newText) {
             // The search is case insensitive because of toLower()
             // I decided not to use Qt::CaseInsensitive in containsAllWords to prevent
             // 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))) {
                 tree_view->setRowHidden(i, root_index, false);
                 ++result_count;

+ 1 - 1
src/yuzu/game_list.h

@@ -89,7 +89,7 @@ private:
 
     void PopupContextMenu(const QPoint& menu_location);
     void RefreshGameDirectory();
-    bool containsAllWords(QString haystack, QString userinput);
+    bool ContainsAllWords(const QString& haystack, const QString& userinput) const;
 
     SearchField* search_field;
     GMainWindow* main_window = nullptr;