rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid using internalPointer in CompletionModel.

Browse Source 
This maybe fixes these weird segfaults.

Based on:
http://python.6.x6.nabble.com/segfault-when-using-a-proxy-and-SIGNAL-quot-clicked-QModelIndex-quot-td1921384.html
This commit is contained in:
Florian Bruhin 2014-02-04 11:05:34 +01:00
parent bf6290cfc8
commit 3a3a63c000
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qutebrowser/utils/completion.py
View File

@ -24,7 +24,9 @@ class CompletionModel(QAbstractItemModel):
super().__init__(parent) super().__init__(parent)
self._data = OrderedDict() self._data = OrderedDict()
self.parents = [] self.parents = []
self.id_map = {}
self.root = CompletionItem([""] * 2) self.root = CompletionItem([""] * 2)
self.id_map[id(self.root)] = self.root
def removeRows(self, position=0, count=1, parent=QModelIndex()): def removeRows(self, position=0, count=1, parent=QModelIndex()):
"""Remove rows from the model. """Remove rows from the model.
@ -43,7 +45,7 @@ class CompletionModel(QAbstractItemModel):
index was invalid. index was invalid.
""" """
if index.isValid(): if index.isValid():
return index.internalPointer() return self.id_map[index.internalId()]
else: else:
return self.root return self.root
@ -63,7 +65,10 @@ class CompletionModel(QAbstractItemModel):
""" """
if not index.isValid(): if not index.isValid():
return QVariant() return QVariant()
item = index.internalPointer() try:
item = self.id_map[index.internalId()]
except KeyError:
return QVariant()
try: try:
return QVariant(item.data(index.column(), role)) return QVariant(item.data(index.column(), role))
except (IndexError, ValueError): except (IndexError, ValueError):
@ -80,7 +85,7 @@ class CompletionModel(QAbstractItemModel):
if not index.isValid(): if not index.isValid():
return Qt.NoItemFlags return Qt.NoItemFlags
flags = Qt.ItemIsEnabled flags = Qt.ItemIsEnabled
if len(index.internalPointer().children) > 0: if len(self.id_map[index.internalId()].children) > 0:
return flags return flags
else: else:
return flags | Qt.ItemIsSelectable return flags | Qt.ItemIsSelectable
@ -103,7 +108,7 @@ class CompletionModel(QAbstractItemModel):
""" """
if not index.isValid(): if not index.isValid():
return False return False
item = index.internalPointer() item = self.id_map[index.internalId()]
try: try:
item.setdata(index.column(), value, role) item.setdata(index.column(), value, role)
except (IndexError, ValueError): except (IndexError, ValueError):
@ -126,11 +131,13 @@ class CompletionModel(QAbstractItemModel):
if not parent.isValid(): if not parent.isValid():
parent_item = self.root parent_item = self.root
else: else:
parent_item = parent.internalPointer() parent_item = self.id_map[parent.internalId()]
child_item = parent_item.children[row] child_item = parent_item.children[row]
if child_item: if child_item:
return self.createIndex(row, column, child_item) index = self.createIndex(row, column, id(child_item))
self.id_map.setdefault(index.internalId(), child_item)
return index
else: else:
return QModelIndex() return QModelIndex()
@ -142,10 +149,10 @@ class CompletionModel(QAbstractItemModel):
""" """
if not index.isValid(): if not index.isValid():
return QModelIndex() return QModelIndex()
item = index.internalPointer().parent item = self.id_map[index.internalId()].parent
if item == self.root or item is None: if item == self.root or item is None:
return QModelIndex() return QModelIndex()
return self.createIndex(item.row(), 0, item) return self.createIndex(item.row(), 0, id(item))
def rowCount(self, parent=QModelIndex()): def rowCount(self, parent=QModelIndex()):
"""Return the rowCount (children count) for a parent. """Return the rowCount (children count) for a parent.
@ -159,7 +166,7 @@ class CompletionModel(QAbstractItemModel):
if not parent.isValid(): if not parent.isValid():
pitem = self.root pitem = self.root
else: else:
pitem = parent.internalPointer() pitem = self.id_map[parent.internalId()]
return len(pitem.children) return len(pitem.children)
@ -175,9 +182,11 @@ class CompletionModel(QAbstractItemModel):
"""Initialize the Qt model based on the data in self._data.""" """Initialize the Qt model based on the data in self._data."""
for (cat, items) in self._data.items(): for (cat, items) in self._data.items():
newcat = CompletionItem([cat], self.root) newcat = CompletionItem([cat], self.root)
self.id_map[id(newcat)] = newcat
self.root.children.append(newcat) self.root.children.append(newcat)
for item in items: for item in items:
newitem = CompletionItem(item, newcat) newitem = CompletionItem(item, newcat)
self.id_map[id(newitem)] = newitem
newcat.children.append(newitem) newcat.children.append(newitem)
def mark_all_items(self, needle): def mark_all_items(self, needle):