Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Bookmarks/BookmarksModel.py	Fri Jan 05 16:04:03 2024 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksModel.py	Sat Jan 06 15:21:02 2024 +0100
@@ -196,14 +196,14 @@
         @return bookmark data
         @rtype Any
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNodeType
 
         if not index.isValid() or index.model() != self:
             return None
 
         bookmarkNode = self.node(index)
         if role in [Qt.ItemDataRole.EditRole, Qt.ItemDataRole.DisplayRole]:
-            if bookmarkNode.type() == BookmarkNode.Separator:
+            if bookmarkNode.type() == BookmarkNodeType.Separator:
                 if index.column() == 0:
                     return 50 * "\xB7"
                 elif index.column() == 1:
@@ -227,10 +227,10 @@
             return bookmarkNode.type()
 
         elif role == BookmarksModel.SeparatorRole:
-            return bookmarkNode.type() == BookmarkNode.Separator
+            return bookmarkNode.type() == BookmarkNodeType.Separator
 
         elif role == Qt.ItemDataRole.DecorationRole and index.column() == 0:
-            if bookmarkNode.type() == BookmarkNode.Folder:
+            if bookmarkNode.type() == BookmarkNodeType.Folder:
                 return EricPixmapCache.getIcon("dirOpen")
 
             return WebBrowserWindow.icon(QUrl(bookmarkNode.url))
@@ -337,7 +337,7 @@
         @return flag indicating the presence of children
         @rtype bool
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNodeType
 
         if parent is None:
             parent = QModelIndex()
@@ -346,7 +346,7 @@
             return True
 
         parentNode = self.node(parent)
-        return parentNode.type() == BookmarkNode.Folder
+        return parentNode.type() == BookmarkNodeType.Folder
 
     def flags(self, index):
         """
@@ -357,7 +357,7 @@
         @return flags
         @rtype Qt.ItemFlags
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNodeType
 
         if not index.isValid():
             return Qt.ItemFlag.NoItemFlags
@@ -374,8 +374,8 @@
 
         flags |= Qt.ItemFlag.ItemIsDragEnabled
 
-        if (index.column() == 0 and type_ != BookmarkNode.Separator) or (
-            index.column() == 1 and type_ == BookmarkNode.Bookmark
+        if (index.column() == 0 and type_ != BookmarkNodeType.Separator) or (
+            index.column() == 1 and type_ == BookmarkNodeType.Bookmark
         ):
             flags |= Qt.ItemFlag.ItemIsEditable
 
@@ -449,7 +449,7 @@
         @return flag indicating successful acceptance of the data
         @rtype bool
         """
-        from .BookmarkNode import BookmarkNode
+        from .BookmarkNode import BookmarkNode, BookmarkNodeType
         from .XbelReader import XbelReader
 
         if action == Qt.DropAction.IgnoreAction:
@@ -464,7 +464,7 @@
             if not data.hasUrls():
                 return False
 
-            node = BookmarkNode(BookmarkNode.Bookmark, parentNode)
+            node = BookmarkNode(BookmarkNodeType.Bookmark, parentNode)
             node.url = bytes(data.urls()[0].toEncoded()).decode()
 
             if data.hasText():