mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-25 09:50:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove YACReader::SearchModifiers

Browse Source 
They are no longer used
This commit is contained in:
Luis Ángel San Martín 2021-12-29 14:58:03 +01:00
parent 1cf4ef97ea
commit d8f224645d
12 changed files with 15 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
YACReaderLibrary/db/comic_query_result_processor.cpp
View File

@ -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);

2
YACReaderLibrary/db/comic_query_result_processor.h
View File

@ -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<ComicItem *> *, const QString &);

2
YACReaderLibrary/db/folder_model.h
View File

@ -30,8 +30,6 @@ protected:
QMap<unsigned long long int, FolderItem *> filteredItems; // relación entre folders
bool filterEnabled;
YACReader::SearchModifiers modifier;
};
class FolderModel : public QAbstractItemModel

22
YACReaderLibrary/db/folder_query_result_processor.cpp
View File

@ -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) {

2
YACReaderLibrary/db/folder_query_result_processor.h
View File

@ -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<unsigned long long int, FolderItem *> *filteredItems, FolderItem *root);

6
YACReaderLibrary/library_window.cpp
View File

@ -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();

2
YACReaderLibrary/library_window.h
View File

@ -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<ComicItem *> *, const QString &);
void setFolderSearchFilterData(QMap<unsigned long long int, FolderItem *> *filteredItems, FolderItem *root);
void clearSearchFilter();

6
common/yacreader_global.h
View File

@ -35,12 +35,6 @@ enum YACReaderErrors {
SevenZNotFound = 700
};
enum SearchModifiers {
NoModifiers = 0,
OnlyRead,
OnlyUnread
};
enum LabelColors {
YRed = 1,
YOrange,

2
custom_widgets/yacreader_macosx_toolbar.h
View File

@ -27,7 +27,7 @@ private:
signals:
// convenience signal for YACReaderLibrary search edit
void filterChanged(YACReader::SearchModifiers, QString);
void filterChanged(QString);
};
class MacToolBarItemWrapper : public QObject

4
custom_widgets/yacreader_macosx_toolbar.mm
View File

@ -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()

2
custom_widgets/yacreader_search_line_edit.cpp
View File

@ -89,5 +89,5 @@ void YACReaderSearchLineEdit::updateCloseButton(const QString &text)
void YACReaderSearchLineEdit::processText(const QString &text)
{
emit filterChanged(YACReader::NoModifiers, text);
emit filterChanged(text);
}

2
custom_widgets/yacreader_search_line_edit.h
View File

@ -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);