--- a/eric6/WebBrowser/Bookmarks/BookmarksModel.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/Bookmarks/BookmarksModel.py Tue Mar 02 17:17:09 2021 +0100
@@ -19,11 +19,11 @@
"""
Class implementing the bookmark model.
"""
- TypeRole = Qt.UserRole + 1
- UrlRole = Qt.UserRole + 2
- UrlStringRole = Qt.UserRole + 3
- VisitCountRole = Qt.UserRole + 4
- SeparatorRole = Qt.UserRole + 5
+ TypeRole = Qt.ItemDataRole.UserRole + 1
+ UrlRole = Qt.ItemDataRole.UserRole + 2
+ UrlStringRole = Qt.ItemDataRole.UserRole + 3
+ VisitCountRole = Qt.ItemDataRole.UserRole + 4
+ SeparatorRole = Qt.ItemDataRole.UserRole + 5
MIMETYPE = "application/bookmarks.xbel"
@@ -140,23 +140,27 @@
return True
- def headerData(self, section, orientation, role=Qt.DisplayRole):
+ def headerData(self, section, orientation,
+ role=Qt.ItemDataRole.DisplayRole):
"""
Public method to get the header data.
@param section section number (integer)
@param orientation header orientation (Qt.Orientation)
- @param role data role (integer)
+ @param role data role (Qt.ItemDataRole)
@return header data
"""
- if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ if (
+ orientation == Qt.Orientation.Horizontal and
+ role == Qt.ItemDataRole.DisplayRole
+ ):
try:
return self.__headers[section]
except IndexError:
pass
return QAbstractItemModel.headerData(self, section, orientation, role)
- def data(self, index, role=Qt.DisplayRole):
+ def data(self, index, role=Qt.ItemDataRole.DisplayRole):
"""
Public method to get data from the model.
@@ -170,7 +174,7 @@
from .BookmarkNode import BookmarkNode
bookmarkNode = self.node(index)
- if role in [Qt.EditRole, Qt.DisplayRole]:
+ if role in [Qt.ItemDataRole.EditRole, Qt.ItemDataRole.DisplayRole]:
if bookmarkNode.type() == BookmarkNode.Separator:
if index.column() == 0:
return 50 * '\xB7'
@@ -197,7 +201,7 @@
elif role == BookmarksModel.SeparatorRole:
return bookmarkNode.type() == BookmarkNode.Separator
- elif role == Qt.DecorationRole:
+ elif role == Qt.ItemDataRole.DecorationRole:
if index.column() == 0:
if bookmarkNode.type() == BookmarkNode.Folder:
return UI.PixmapCache.getIcon("dirOpen")
@@ -319,14 +323,14 @@
@return flags (Qt.ItemFlags)
"""
if not index.isValid():
- return Qt.NoItemFlags
+ return Qt.ItemFlag.NoItemFlags
node = self.node(index)
type_ = node.type()
- flags = Qt.ItemIsSelectable | Qt.ItemIsEnabled
+ flags = Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsEnabled
if self.hasChildren(index):
- flags |= Qt.ItemIsDropEnabled
+ flags |= Qt.ItemFlag.ItemIsDropEnabled
if (
node == self.__bookmarksManager.menu() or
@@ -334,14 +338,14 @@
):
return flags
- flags |= Qt.ItemIsDragEnabled
+ flags |= Qt.ItemFlag.ItemIsDragEnabled
from .BookmarkNode import BookmarkNode
if (
(index.column() == 0 and type_ != BookmarkNode.Separator) or
(index.column() == 1 and type_ == BookmarkNode.Bookmark)
):
- flags |= Qt.ItemIsEditable
+ flags |= Qt.ItemFlag.ItemIsEditable
return flags
@@ -351,7 +355,7 @@
@return supported drop actions (Qt.DropAction)
"""
- return Qt.CopyAction | Qt.MoveAction
+ return Qt.DropAction.CopyAction | Qt.DropAction.MoveAction
def mimeTypes(self):
"""
@@ -371,7 +375,7 @@
from .XbelWriter import XbelWriter
data = QByteArray()
- stream = QDataStream(data, QIODevice.WriteOnly)
+ stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
urls = []
for index in indexes:
@@ -380,7 +384,7 @@
encodedData = QByteArray()
buffer = QBuffer(encodedData)
- buffer.open(QIODevice.ReadWrite)
+ buffer.open(QIODevice.OpenModeFlag.ReadWrite)
writer = XbelWriter()
parentNode = self.node(index)
writer.write(buffer, parentNode)
@@ -403,7 +407,7 @@
@param parent index of the parent node (QModelIndex)
@return flag indicating successful acceptance of the data (boolean)
"""
- if action == Qt.IgnoreAction:
+ if action == Qt.DropAction.IgnoreAction:
return True
if column > 0:
@@ -428,7 +432,7 @@
return True
ba = data.data(self.MIMETYPE)
- stream = QDataStream(ba, QIODevice.ReadOnly)
+ stream = QDataStream(ba, QIODevice.OpenModeFlag.ReadOnly)
if stream.atEnd():
return False
@@ -440,7 +444,7 @@
encodedData = QByteArray()
stream >> encodedData
buffer = QBuffer(encodedData)
- buffer.open(QIODevice.ReadOnly)
+ buffer.open(QIODevice.OpenModeFlag.ReadOnly)
reader = XbelReader()
rootNode = reader.read(buffer)
@@ -453,7 +457,7 @@
return True
- def setData(self, index, value, role=Qt.EditRole):
+ def setData(self, index, value, role=Qt.ItemDataRole.EditRole):
"""
Public method to set the data of a node cell.
@@ -462,12 +466,15 @@
@param role role of the data (integer)
@return flag indicating success (boolean)
"""
- if not index.isValid() or (self.flags(index) & Qt.ItemIsEditable) == 0:
+ if (
+ not index.isValid() or
+ (self.flags(index) & Qt.ItemFlag.ItemIsEditable) == 0
+ ):
return False
item = self.node(index)
- if role in (Qt.EditRole, Qt.DisplayRole):
+ if role in (Qt.ItemDataRole.EditRole, Qt.ItemDataRole.DisplayRole):
if index.column() == 0:
self.__bookmarksManager.setTitle(item, value)
elif index.column() == 1:
