From 12c2ff027a48e9b814b326222489f21ec3b9ee74 Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Fri, 5 Feb 2021 15:26:43 +0200 Subject: [PATCH 1/2] ComicQueryResultProcessor: fix a typo in the class name --- YACReaderLibrary/YACReaderLibrary.pro | 4 ++-- ...t_procesor.cpp => comic_query_result_processor.cpp} | 8 ++++---- ...esult_procesor.h => comic_query_result_processor.h} | 10 +++++----- YACReaderLibrary/library_window.cpp | 6 +++--- YACReaderLibrary/library_window.h | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) rename YACReaderLibrary/db/{comic_query_result_procesor.cpp => comic_query_result_processor.cpp} (90%) rename YACReaderLibrary/db/{comic_query_result_procesor.h => comic_query_result_processor.h} (70%) diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 3910b5dc..1080fce1 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -80,7 +80,7 @@ QT += sql network widgets script svg HEADERS += comic_flow.h \ ../common/concurrent_queue.h \ create_library_dialog.h \ - db/comic_query_result_procesor.h \ + db/comic_query_result_processor.h \ db/folder_query_result_processor.h \ db/query_lexer.h \ library_creator.h \ @@ -158,7 +158,7 @@ HEADERS += comic_flow.h \ SOURCES += comic_flow.cpp \ create_library_dialog.cpp \ - db/comic_query_result_procesor.cpp \ + db/comic_query_result_processor.cpp \ db/folder_query_result_processor.cpp \ db/query_lexer.cpp \ library_creator.cpp \ diff --git a/YACReaderLibrary/db/comic_query_result_procesor.cpp b/YACReaderLibrary/db/comic_query_result_processor.cpp similarity index 90% rename from YACReaderLibrary/db/comic_query_result_procesor.cpp rename to YACReaderLibrary/db/comic_query_result_processor.cpp index 270075aa..d00ddebb 100644 --- a/YACReaderLibrary/db/comic_query_result_procesor.cpp +++ b/YACReaderLibrary/db/comic_query_result_processor.cpp @@ -1,4 +1,4 @@ -#include "comic_query_result_procesor.h" +#include "comic_query_result_processor.h" #include "comic_item.h" #include "comic_model.h" @@ -20,12 +20,12 @@ QString getLastExecutedQuery(const QSqlQuery &query) return str; } -YACReader::ComicQueryResultProcesor::ComicQueryResultProcesor() +YACReader::ComicQueryResultProcessor::ComicQueryResultProcessor() : querySearchQueue(1) { } -void YACReader::ComicQueryResultProcesor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, const QString &databasePath) +void YACReader::ComicQueryResultProcessor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, const QString &databasePath) { querySearchQueue.cancellPending(); @@ -81,7 +81,7 @@ void YACReader::ComicQueryResultProcesor::createModelData(const YACReader::Searc }); } -QList *YACReader::ComicQueryResultProcesor::modelData(QSqlQuery &sqlquery) +QList *YACReader::ComicQueryResultProcessor::modelData(QSqlQuery &sqlquery) { auto list = new QList(); diff --git a/YACReaderLibrary/db/comic_query_result_procesor.h b/YACReaderLibrary/db/comic_query_result_processor.h similarity index 70% rename from YACReaderLibrary/db/comic_query_result_procesor.h rename to YACReaderLibrary/db/comic_query_result_processor.h index a948611c..fef245ac 100644 --- a/YACReaderLibrary/db/comic_query_result_procesor.h +++ b/YACReaderLibrary/db/comic_query_result_processor.h @@ -1,5 +1,5 @@ -#ifndef COMIC_QUERY_RESULT_PROCESOR_H -#define COMIC_QUERY_RESULT_PROCESOR_H +#ifndef COMIC_QUERY_RESULT_PROCESSOR_H +#define COMIC_QUERY_RESULT_PROCESSOR_H #include #include @@ -11,11 +11,11 @@ class ComicItem; namespace YACReader { -class ComicQueryResultProcesor : public QObject +class ComicQueryResultProcessor : public QObject { Q_OBJECT public: - ComicQueryResultProcesor(); + ComicQueryResultProcessor(); public slots: void createModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath); @@ -29,4 +29,4 @@ private: }; }; -#endif // COMIC_QUERY_RESULT_PROCESOR_H +#endif // COMIC_QUERY_RESULT_PROCESSOR_H diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index b3edb761..756759f4 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -94,7 +94,7 @@ using namespace YACReader; LibraryWindow::LibraryWindow() - : QMainWindow(), fullscreen(false), previousFilter(""), fetching(false), status(LibraryWindow::Normal), removeError(false), comicQueryResultProcesor() + : QMainWindow(), fullscreen(false), previousFilter(""), fetching(false), status(LibraryWindow::Normal), removeError(false) { setupUI(); @@ -1115,7 +1115,7 @@ void LibraryWindow::createConnections() //Search filter connect(searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString))); - connect(&comicQueryResultProcesor, &ComicQueryResultProcesor::newData, this, &LibraryWindow::setComicSearchFilterData); + connect(&comicQueryResultProcessor, &ComicQueryResultProcessor::newData, this, &LibraryWindow::setComicSearchFilterData); connect(folderQueryResultProcessor.get(), &FolderQueryResultProcessor::newData, this, &LibraryWindow::setFolderSearchFilterData); //ContextMenus @@ -2150,7 +2150,7 @@ void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, Q { if (!filter.isEmpty()) { folderQueryResultProcessor->createModelData(modifier, filter, true); - comicQueryResultProcesor.createModelData(modifier, filter, foldersModel->getDatabase()); + comicQueryResultProcessor.createModelData(modifier, 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 af9664e2..d2691990 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -10,7 +10,7 @@ #include "yacreader_libraries.h" #include "yacreader_navigation_controller.h" -#include "comic_query_result_procesor.h" +#include "comic_query_result_processor.h" #include "folder_query_result_processor.h" #include @@ -416,7 +416,7 @@ private: std::future upgradeLibraryFuture; TrayIconController *trayIconController; - ComicQueryResultProcesor comicQueryResultProcesor; + ComicQueryResultProcessor comicQueryResultProcessor; std::unique_ptr folderQueryResultProcessor; }; From 5656c3f54087df05a61d7542b657946f643560df Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Sat, 6 Feb 2021 11:51:18 +0200 Subject: [PATCH 2/2] Make ComicQueryResultProcessor::modelData() static The function doesn't use data members or other member functions. It could even be put into an unnamed namespace in the cpp file, but that would require more changes and complicate turning it back into a member function if need be in the future. --- YACReaderLibrary/db/comic_query_result_processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YACReaderLibrary/db/comic_query_result_processor.h b/YACReaderLibrary/db/comic_query_result_processor.h index fef245ac..09b16cb0 100644 --- a/YACReaderLibrary/db/comic_query_result_processor.h +++ b/YACReaderLibrary/db/comic_query_result_processor.h @@ -25,7 +25,7 @@ signals: private: ConcurrentQueue querySearchQueue; - QList *modelData(QSqlQuery &sqlquery); + static QList *modelData(QSqlQuery &sqlquery); }; };