diff --git a/src/calibre/gui2/jobs.py b/src/calibre/gui2/jobs.py index 7664f5049c..c1cc15293a 100644 --- a/src/calibre/gui2/jobs.py +++ b/src/calibre/gui2/jobs.py @@ -29,7 +29,13 @@ from calibre.gui2.threaded_jobs import ThreadedJobServer, ThreadedJob from calibre.utils.search_query_parser import SearchQueryParser, ParseException from calibre.utils.icu import lower -class JobManager(QAbstractTableModel, SearchQueryParser): # {{{ +class AdaptSQP(SearchQueryParser): + + def __init__(self, *args, **kwargs): + pass + + +class JobManager(QAbstractTableModel, AdaptSQP): # {{{ job_added = pyqtSignal(int) job_done = pyqtSignal(int) diff --git a/src/calibre/web/feeds/recipes/model.py b/src/calibre/web/feeds/recipes/model.py index 673679d2b5..c8db39f869 100644 --- a/src/calibre/web/feeds/recipes/model.py +++ b/src/calibre/web/feeds/recipes/model.py @@ -126,7 +126,12 @@ class NewsItem(NewsTreeItem): def __cmp__(self, other): return cmp(self.title.lower(), getattr(other, 'title', '').lower()) -class RecipeModel(QAbstractItemModel, SearchQueryParser): +class AdaptSQP(SearchQueryParser): + + def __init__(self, *args, **kwargs): + pass + +class RecipeModel(QAbstractItemModel, AdaptSQP): LOCATIONS = ['all'] searched = pyqtSignal(object) @@ -250,6 +255,9 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser): self.root = new_root self.reset() + def reset(self): + self.beginResetModel(), self.endResetModel() + def recipe_from_urn(self, urn): coll = self.custom_recipe_collection if 'custom:' in urn else \ self.builtin_recipe_collection