diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index c86a5c16..9a0e4bf2 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -75,7 +75,7 @@ QT += sql network widgets 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 \ @@ -153,7 +153,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 61% rename from YACReaderLibrary/db/comic_query_result_procesor.h rename to YACReaderLibrary/db/comic_query_result_processor.h index a948611c..09b16cb0 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); @@ -25,8 +25,8 @@ signals: private: ConcurrentQueue querySearchQueue; - QList *modelData(QSqlQuery &sqlquery); + static QList *modelData(QSqlQuery &sqlquery); }; }; -#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 65f5a76b..5d703bbd 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -95,7 +95,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(); @@ -1116,7 +1116,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 @@ -2151,7 +2151,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; };