From 119f9c0e18b61a9bd13a3ccf67e0638a8809e3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= Date: Sun, 17 Jul 2016 12:46:51 +0200 Subject: [PATCH] completion: get rid of model-specific sort method (see #545) --- qutebrowser/completion/models/base.py | 7 ------- qutebrowser/completion/models/sortfilter.py | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/qutebrowser/completion/models/base.py b/qutebrowser/completion/models/base.py index cb589ce38..93e6dc513 100644 --- a/qutebrowser/completion/models/base.py +++ b/qutebrowser/completion/models/base.py @@ -126,10 +126,3 @@ class BaseCompletionModel(QStandardItemModel): else: # category return Qt.NoItemFlags - - def sort(self, column, order=Qt.AscendingOrder): - """Sort the data in column according to order. - - Override QAbstractItemModel::sort. - """ - raise NotImplementedError diff --git a/qutebrowser/completion/models/sortfilter.py b/qutebrowser/completion/models/sortfilter.py index 19c3d61d2..0e3b96050 100644 --- a/qutebrowser/completion/models/sortfilter.py +++ b/qutebrowser/completion/models/sortfilter.py @@ -63,9 +63,6 @@ class CompletionFilterModel(QSortFilterProxyModel): Invalidates the filter and re-sorts the model. - If the current completion model overrides sort(), it is used. - If not, the default implementation in QCompletionFilterModel is called. - Args: val: The value to set. """ @@ -76,10 +73,7 @@ class CompletionFilterModel(QSortFilterProxyModel): self.pattern_re = re.compile(val, re.IGNORECASE) self.invalidateFilter() sortcol = 0 - try: - self.srcmodel.sort(sortcol) - except NotImplementedError: - self.sort(sortcol) + self.sort(sortcol) self.invalidate() def count(self):