diff --git a/include/library.h b/include/library.h index fd581688..f3b49436 100644 --- a/include/library.h +++ b/include/library.h @@ -114,8 +114,6 @@ class Filter { private: friend class Library; - bool accept(const Book& book) const; - bool acceptByQueryOnly(const Book& book) const; bool acceptByNonQueryCriteria(const Book& book) const; }; diff --git a/src/library.cpp b/src/library.cpp index 6a2bc5db..c12a0a52 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -596,11 +596,6 @@ bool Filter::hasQuery() const return ACTIVE(QUERY); } -bool Filter::accept(const Book& book) const -{ - return acceptByNonQueryCriteria(book) && acceptByQueryOnly(book); -} - bool Filter::acceptByNonQueryCriteria(const Book& book) const { auto local = !book.getPath().empty(); @@ -647,15 +642,4 @@ bool Filter::acceptByNonQueryCriteria(const Book& book) const return true; } -bool Filter::acceptByQueryOnly(const Book& book) const -{ - if ( ACTIVE(QUERY) - && !(matchRegex(book.getTitle(), "\\Q" + _query + "\\E") - || matchRegex(book.getDescription(), "\\Q" + _query + "\\E"))) - return false; - - return true; - -} - }