Clean up coding style

This commit is contained in:
Florian Bruhin 2016-04-28 07:07:49 +02:00
parent c228bb263b
commit 2f10ab4e9a

View File

@ -206,10 +206,10 @@ class TabCompletionModel(base.BaseCompletionModel):
tabbed_browser = objreg.get('tabbed-browser', scope='window', tabbed_browser = objreg.get('tabbed-browser', scope='window',
window=win_id) window=win_id)
if not tabbed_browser.shutting_down: if not tabbed_browser.shutting_down:
window_count = window_count + 1 window_count += 1
if window_count < self.rowCount(): if window_count < self.rowCount():
self.removeRows(window_count, self.rowCount()-window_count) self.removeRows(window_count, self.rowCount() - window_count)
for i, win_id in enumerate(objreg.window_registry): for i, win_id in enumerate(objreg.window_registry):
tabbed_browser = objreg.get('tabbed-browser', scope='window', tabbed_browser = objreg.get('tabbed-browser', scope='window',
@ -223,15 +223,15 @@ class TabCompletionModel(base.BaseCompletionModel):
c.setData("{}".format(win_id), Qt.DisplayRole) c.setData("{}".format(win_id), Qt.DisplayRole)
if tabbed_browser.count() < c.rowCount(): if tabbed_browser.count() < c.rowCount():
c.removeRows(tabbed_browser.count(), c.removeRows(tabbed_browser.count(),
c.rowCount()-tabbed_browser.count()) c.rowCount() - tabbed_browser.count())
for idx in range(tabbed_browser.count()): for idx in range(tabbed_browser.count()):
tab = tabbed_browser.widget(idx) tab = tabbed_browser.widget(idx)
if idx >= c.rowCount(): if idx >= c.rowCount():
self.new_item(c, "{}/{}".format(win_id, idx+1), self.new_item(c, "{}/{}".format(win_id, idx + 1),
tab.url().toDisplayString(), tab.url().toDisplayString(),
tabbed_browser.page_title(idx)) tabbed_browser.page_title(idx))
else: else:
c.child(idx, 0).setData("{}/{}".format(win_id, idx+1), c.child(idx, 0).setData("{}/{}".format(win_id, idx + 1),
Qt.DisplayRole) Qt.DisplayRole)
c.child(idx, 1).setData(tab.url().toDisplayString(), c.child(idx, 1).setData(tab.url().toDisplayString(),
Qt.DisplayRole) Qt.DisplayRole)
@ -250,9 +250,7 @@ class TabCompletionModel(base.BaseCompletionModel):
qtutils.ensure_valid(category) qtutils.ensure_valid(category)
index = category.child(index.row(), self.IDX_COLUMN) index = category.child(index.row(), self.IDX_COLUMN)
win_id, tab_index = index.data().split('/') win_id, tab_index = index.data().split('/')
win_id = int(win_id)
tab_index = int(tab_index)
tabbed_browser = objreg.get('tabbed-browser', scope='window', tabbed_browser = objreg.get('tabbed-browser', scope='window',
window=win_id) window=int(win_id))
tabbed_browser.on_tab_close_requested(tab_index-1) tabbed_browser.on_tab_close_requested(int(tab_index) - 1)