From e43a67447fd87643d5e036fece1dfb312cccc5fd Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Fri, 19 Mar 2021 14:40:06 +0200
Subject: [PATCH] QmlDesigner: Remove unnecessary method param

Introduced by d37f6648f3a7821e15ad22a2e35f901a8b078bdb

Change-Id: Ib2f824c0a3755f4551b93f700bd0bb719a099003
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/itemlibrary/itemlibrarycategory.cpp        | 4 ++--
 .../components/itemlibrary/itemlibrarycategory.h          | 2 +-
 .../components/itemlibrary/itemlibraryimport.cpp          | 4 ++--
 .../components/itemlibrary/itemlibraryimport.h            | 2 +-
 .../components/itemlibrary/itemlibrarymodel.cpp           | 8 ++++----
 .../qmldesigner/components/itemlibrary/itemlibrarymodel.h | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp
index 1c5b8bfcb5f..f55fd309219 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp
@@ -60,7 +60,7 @@ QObject *ItemLibraryCategory::itemModel()
     return &m_itemModel;
 }
 
-bool ItemLibraryCategory::updateItemVisibility(const QString &searchText, bool *changed, bool expand)
+bool ItemLibraryCategory::updateItemVisibility(const QString &searchText, bool *changed)
 {
     bool hasVisibleItems = false;
 
@@ -81,7 +81,7 @@ bool ItemLibraryCategory::updateItemVisibility(const QString &searchText, bool *
     }
 
     // expand category if it has an item matching search criteria
-    if (expand && hasVisibleItems && !categoryExpanded())
+    if (!searchText.isEmpty() && hasVisibleItems && !categoryExpanded())
         setExpanded(true);
 
     return hasVisibleItems;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.h
index d99d4ea4dc5..ad3f1579a00 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.h
@@ -50,7 +50,7 @@ public:
     void addItem(ItemLibraryItem *item);
     QObject *itemModel();
 
-    bool updateItemVisibility(const QString &searchText, bool *changed, bool expand = false);
+    bool updateItemVisibility(const QString &searchText, bool *changed);
 
     bool setVisible(bool isVisible);
     bool isVisible() const;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp
index 9276ea1fb12..79acb29d58a 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp
@@ -110,14 +110,14 @@ void ItemLibraryImport::expandCategories(bool expand)
     m_categoryModel.expandCategories(expand);
 }
 
-bool ItemLibraryImport::updateCategoryVisibility(const QString &searchText, bool *changed, bool expand)
+bool ItemLibraryImport::updateCategoryVisibility(const QString &searchText, bool *changed)
 {
     bool hasVisibleCategories = false;
     *changed = false;
 
     for (const auto &category : m_categoryModel.categorySections()) {
         bool categoryChanged = false;
-        bool hasVisibleItems = category->updateItemVisibility(searchText, &categoryChanged, expand);
+        bool hasVisibleItems = category->updateItemVisibility(searchText, &categoryChanged);
         categoryChanged |= category->setVisible(hasVisibleItems);
 
         *changed |= categoryChanged;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.h
index 10d1ea92807..3b860e488b5 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.h
@@ -70,7 +70,7 @@ public:
 
     void addCategory(ItemLibraryCategory *category);
     QObject *categoryModel();
-    bool updateCategoryVisibility(const QString &searchText, bool *changed, bool expand = false);
+    bool updateCategoryVisibility(const QString &searchText, bool *changed);
     bool setVisible(bool isVisible);
     void setImportUsed(bool importUsed);
     void sortCategorySections();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index c07614ca3b8..6c395fbd686 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -163,7 +163,7 @@ void ItemLibraryModel::setSearchText(const QString &searchText)
         m_searchText = lowerSearchText;
 
         bool changed = false;
-        updateVisibility(&changed, !m_searchText.isEmpty());
+        updateVisibility(&changed);
     }
 }
 
@@ -401,18 +401,18 @@ void ItemLibraryModel::updateUsedImports(const QList<Import> &usedImports)
     }
 }
 
-void ItemLibraryModel::updateVisibility(bool *changed, bool expand)
+void ItemLibraryModel::updateVisibility(bool *changed)
 {
     for (ItemLibraryImport *import : std::as_const(m_importList)) {
         bool categoryChanged = false;
-        bool hasVisibleItems = import->updateCategoryVisibility(m_searchText, &categoryChanged, expand);
+        bool hasVisibleItems = import->updateCategoryVisibility(m_searchText, &categoryChanged);
         *changed |= categoryChanged;
 
         if (import->sectionType() == ItemLibraryImport::SectionType::Unimported)
             *changed |= import->setVisible(!m_searchText.isEmpty());
 
         // expand import if it has an item matching search criteria
-        if (expand && hasVisibleItems && !import->importExpanded())
+        if (!m_searchText.isEmpty() && hasVisibleItems && !import->importExpanded())
             import->setImportExpanded();
     }
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 8d592e29cc4..2412550a3a0 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -72,7 +72,7 @@ public:
     Import entryToImport(const ItemLibraryEntry &entry);
 
 private:
-    void updateVisibility(bool *changed, bool expand = false);
+    void updateVisibility(bool *changed);
     void addRoleNames();
     void sortSections();
     void clearSections();