Run searches on UI thread, remove hierarchy search results, simplify …

…search logic
sakertooth · Feb 2, 2025 · c51b81f · c51b81f
1 parent 10bdf12
commit c51b81f
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 282 deletions.
diff --git a/include/FileBrowser.h b/include/FileBrowser.h
@@ -29,9 +29,7 @@
 #include <QDir>
 #include <QMutex>
 #include <QProgressBar>
-#include <memory>
 
-#include "FileSearch.h"
 #include "embed.h"
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
@@ -106,10 +104,7 @@ private slots:
 	void saveDirectoriesStates();
 	void restoreDirectoriesStates();
 
-	void foundSearchMatch(FileSearch* search, const QString& match);
-	void searchCompleted(FileSearch* search);
 	void onSearch(const QString& filter);
-	void displaySearch(bool on);
 
 	void addContentCheckBox();
 
@@ -118,7 +113,6 @@ private slots:
 
 	QLineEdit * m_filterEdit;
 
-	std::shared_ptr<FileSearch> m_currentSearch;
 	QProgressBar* m_searchIndicator = nullptr;
 
 	QString m_directories; //!< Directories to search, split with '*'
@@ -204,7 +198,7 @@ private slots:
 class Directory : public QTreeWidgetItem
 {
 public:
-	Directory(const QString& filename, const QString& path, const QString& filter, bool disableEntryPopulation = false);
+	Directory(const QString& filename, const QString& path, const QString& filter);
 
 	void update();
 
@@ -247,7 +241,6 @@ class Directory : public QTreeWidgetItem
 	QString m_filter;
 
 	int m_dirCount;
-	bool m_disableEntryPopulation = false;
 } ;
 
 

diff --git a/include/FileSearch.h b/include/FileSearch.h
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -23,7 +23,6 @@ set(LMMS_SRCS
 	core/Engine.cpp
 	core/EnvelopeAndLfoParameters.cpp
 	core/fft_helpers.cpp
-	core/FileSearch.cpp
 	core/Mixer.cpp
 	core/ImportFilter.cpp
 	core/InlineAutomation.cpp

diff --git a/src/core/FileSearch.cpp b/src/core/FileSearch.cpp