From d8f224645d4b3e2bc66084943e79bca31b305c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 29 Dec 2021 14:58:03 +0100 Subject: [PATCH] Remove YACReader::SearchModifiers They are no longer used --- .../db/comic_query_result_processor.cpp | 20 ++--------------- .../db/comic_query_result_processor.h | 2 +- YACReaderLibrary/db/folder_model.h | 2 -- .../db/folder_query_result_processor.cpp | 22 ++----------------- .../db/folder_query_result_processor.h | 2 +- YACReaderLibrary/library_window.cpp | 6 ++--- YACReaderLibrary/library_window.h | 2 +- common/yacreader_global.h | 6 ----- custom_widgets/yacreader_macosx_toolbar.h | 2 +- custom_widgets/yacreader_macosx_toolbar.mm | 4 ++-- custom_widgets/yacreader_search_line_edit.cpp | 2 +- custom_widgets/yacreader_search_line_edit.h | 2 +- 12 files changed, 15 insertions(+), 57 deletions(-) diff --git a/YACReaderLibrary/db/comic_query_result_processor.cpp b/YACReaderLibrary/db/comic_query_result_processor.cpp index b05acb5c..2e075004 100644 --- a/YACReaderLibrary/db/comic_query_result_processor.cpp +++ b/YACReaderLibrary/db/comic_query_result_processor.cpp @@ -14,7 +14,7 @@ YACReader::ComicQueryResultProcessor::ComicQueryResultProcessor() { } -void YACReader::ComicQueryResultProcessor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, const QString &databasePath) +void YACReader::ComicQueryResultProcessor::createModelData(const QString &filter, const QString &databasePath) { querySearchQueue.cancelPending(); @@ -32,24 +32,8 @@ void YACReader::ComicQueryResultProcessor::createModelData(const YACReader::Sear auto result = parser.parse(filter.toStdString()); result.buildSqlString(queryString); - switch (modifier) { - case YACReader::NoModifiers: - queryString += " LIMIT :limit"; - break; + queryString += " LIMIT :limit"; - case YACReader::OnlyRead: - queryString += " AND ci.read = 1 LIMIT :limit"; - break; - - case YACReader::OnlyUnread: - queryString += " AND ci.read = 0 LIMIT :limit"; - break; - - default: - queryString += " LIMIT :limit"; - QLOG_ERROR() << "not implemented"; - break; - } selectQuery.prepare(queryString.c_str()); selectQuery.bindValue(":limit", 500); // TODO, load this value from settings result.bindValues(selectQuery); diff --git a/YACReaderLibrary/db/comic_query_result_processor.h b/YACReaderLibrary/db/comic_query_result_processor.h index 09b16cb0..1a7359ee 100644 --- a/YACReaderLibrary/db/comic_query_result_processor.h +++ b/YACReaderLibrary/db/comic_query_result_processor.h @@ -18,7 +18,7 @@ public: ComicQueryResultProcessor(); public slots: - void createModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath); + void createModelData(const QString &filter, const QString &databasePath); signals: void newData(QList *, const QString &); diff --git a/YACReaderLibrary/db/folder_model.h b/YACReaderLibrary/db/folder_model.h index 8a045906..39ca7242 100644 --- a/YACReaderLibrary/db/folder_model.h +++ b/YACReaderLibrary/db/folder_model.h @@ -30,8 +30,6 @@ protected: QMap filteredItems; // relación entre folders bool filterEnabled; - - YACReader::SearchModifiers modifier; }; class FolderModel : public QAbstractItemModel diff --git a/YACReaderLibrary/db/folder_query_result_processor.cpp b/YACReaderLibrary/db/folder_query_result_processor.cpp index 2ecc83b4..7670e9d3 100644 --- a/YACReaderLibrary/db/folder_query_result_processor.cpp +++ b/YACReaderLibrary/db/folder_query_result_processor.cpp @@ -20,7 +20,7 @@ YACReader::FolderQueryResultProcessor::FolderQueryResultProcessor(FolderModel *m { } -void YACReader::FolderQueryResultProcessor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, bool includeComics) +void YACReader::FolderQueryResultProcessor::createModelData(const QString &filter, bool includeComics) { querySearchQueue.cancelPending(); @@ -43,30 +43,12 @@ void YACReader::FolderQueryResultProcessor::createModelData(const YACReader::Sea auto result = parser.parse(filter.toStdString()); result.buildSqlString(queryString); - switch (modifier) { - case YACReader::NoModifiers: - queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name"; - break; - - case YACReader::OnlyRead: - queryString += " AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name"; - break; - - case YACReader::OnlyUnread: - queryString += " AND f.id <> 1 AND ci.read = 0 ORDER BY f.parentId,f.name"; - break; - - default: - queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name"; - QLOG_ERROR() << "not implemented"; - break; - } + queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name"; selectQuery.prepare(queryString.c_str()); result.bindValues(selectQuery); selectQuery.exec(); - QLOG_DEBUG() << selectQuery.lastError() << "--"; setupFilteredModelData(selectQuery); } catch (const std::exception &e) { diff --git a/YACReaderLibrary/db/folder_query_result_processor.h b/YACReaderLibrary/db/folder_query_result_processor.h index faa59046..c375100d 100644 --- a/YACReaderLibrary/db/folder_query_result_processor.h +++ b/YACReaderLibrary/db/folder_query_result_processor.h @@ -19,7 +19,7 @@ public: FolderQueryResultProcessor(FolderModel *model); public slots: - void createModelData(const SearchModifiers modifier, const QString &filter, bool includeComics); + void createModelData(const QString &filter, bool includeComics); signals: void newData(QMap *filteredItems, FolderItem *root); diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 4c905c06..8bb81af8 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -2233,11 +2233,11 @@ void LibraryWindow::toNormal() #endif -void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter) +void LibraryWindow::setSearchFilter(QString filter) { if (!filter.isEmpty()) { - folderQueryResultProcessor->createModelData(modifier, filter, true); - comicQueryResultProcessor.createModelData(modifier, filter, foldersModel->getDatabase()); + folderQueryResultProcessor->createModelData(filter, true); + comicQueryResultProcessor.createModelData(filter, foldersModel->getDatabase()); } else if (status == LibraryWindow::Searching) { // if no searching, then ignore this clearSearchFilter(); navigationController->loadPreviousStatus(); diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h index dc92b5bc..db201a3b 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -351,7 +351,7 @@ public slots: void toggleFullScreen(); void toNormal(); void toFullScreen(); - void setSearchFilter(const YACReader::SearchModifiers modifier, QString filter); + void setSearchFilter(QString filter); void setComicSearchFilterData(QList *, const QString &); void setFolderSearchFilterData(QMap *filteredItems, FolderItem *root); void clearSearchFilter(); diff --git a/common/yacreader_global.h b/common/yacreader_global.h index ab0c5681..e5b3c090 100644 --- a/common/yacreader_global.h +++ b/common/yacreader_global.h @@ -35,12 +35,6 @@ enum YACReaderErrors { SevenZNotFound = 700 }; -enum SearchModifiers { - NoModifiers = 0, - OnlyRead, - OnlyUnread -}; - enum LabelColors { YRed = 1, YOrange, diff --git a/custom_widgets/yacreader_macosx_toolbar.h b/custom_widgets/yacreader_macosx_toolbar.h index cb794c7c..35b69f18 100644 --- a/custom_widgets/yacreader_macosx_toolbar.h +++ b/custom_widgets/yacreader_macosx_toolbar.h @@ -27,7 +27,7 @@ private: signals: // convenience signal for YACReaderLibrary search edit - void filterChanged(YACReader::SearchModifiers, QString); + void filterChanged(QString); }; class MacToolBarItemWrapper : public QObject diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm index b8097a7a..e5008868 100644 --- a/custom_widgets/yacreader_macosx_toolbar.mm +++ b/custom_widgets/yacreader_macosx_toolbar.mm @@ -145,7 +145,7 @@ { NSTextField *textField = [notification object]; NSLog(@"%@", [textField stringValue]); - Q_EMIT mylineedit->filterChanged(YACReader::NoModifiers, QString::fromNSString([textField stringValue])); + Q_EMIT mylineedit->filterChanged(QString::fromNSString([textField stringValue])); } @end @@ -336,7 +336,7 @@ QString YACReaderMacOSXSearchLineEdit::text() void YACReaderMacOSXSearchLineEdit::clear() { [((NSTextField *)nstextfield) setStringValue:@""]; - emit filterChanged(YACReader::NoModifiers, ""); + emit filterChanged(""); } void YACReaderMacOSXSearchLineEdit::clearText() diff --git a/custom_widgets/yacreader_search_line_edit.cpp b/custom_widgets/yacreader_search_line_edit.cpp index f0690268..35264b28 100644 --- a/custom_widgets/yacreader_search_line_edit.cpp +++ b/custom_widgets/yacreader_search_line_edit.cpp @@ -89,5 +89,5 @@ void YACReaderSearchLineEdit::updateCloseButton(const QString &text) void YACReaderSearchLineEdit::processText(const QString &text) { - emit filterChanged(YACReader::NoModifiers, text); + emit filterChanged(text); } diff --git a/custom_widgets/yacreader_search_line_edit.h b/custom_widgets/yacreader_search_line_edit.h index 33197222..fdedef1d 100644 --- a/custom_widgets/yacreader_search_line_edit.h +++ b/custom_widgets/yacreader_search_line_edit.h @@ -22,7 +22,7 @@ protected: void resizeEvent(QResizeEvent *); signals: - void filterChanged(const YACReader::SearchModifiers, QString); + void filterChanged(QString); private slots: void updateCloseButton(const QString &text);