From d9d68db5dfd0329864d1296e93dd444c503d3501 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 29 Jul 2015 12:44:38 +0200 Subject: [PATCH] Simplify delete_cur_item for UrlCompletionModel. --- qutebrowser/completion/models/urlmodel.py | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py index cf89d5d93..702f9458e 100644 --- a/qutebrowser/completion/models/urlmodel.py +++ b/qutebrowser/completion/models/urlmodel.py @@ -150,16 +150,17 @@ class UrlCompletionModel(base.BaseCompletionModel): completion: The Completion object to use. """ index = completion.currentIndex() - model = completion.model() - url = model.data(index) + qtutils.ensure_valid(index) + url = index.data() category = index.parent() - if category.isValid(): - if category.data() == 'Bookmarks': - bookmark_manager = objreg.get('bookmark-manager') - bookmark_manager.delete(url) - elif category.data() == 'Quickmarks': - quickmark_manager = objreg.get('quickmark-manager') - sibling = index.sibling(index.row(), self.TEXT_COLUMN) - qtutils.ensure_valid(sibling) - name = model.data(sibling) - quickmark_manager.quickmark_del(name) + qtutils.ensure_valid(category) + + if category.data() == 'Bookmarks': + bookmark_manager = objreg.get('bookmark-manager') + bookmark_manager.delete(url) + elif category.data() == 'Quickmarks': + quickmark_manager = objreg.get('quickmark-manager') + sibling = index.sibling(index.row(), self.TEXT_COLUMN) + qtutils.ensure_valid(sibling) + name = model.data(sibling) + quickmark_manager.quickmark_del(name)