Mercurial Repositories > eric / file diff

--- a/eric6/Debugger/DebugViewer.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Debugger/DebugViewer.py	Sun Mar 28 15:00:11 2021 +0200
@@ -50,8 +50,8 @@
     sourceFile = pyqtSignal(str, int)
     preferencesChanged = pyqtSignal()
     
-    ThreadIdRole = Qt.UserRole + 1
-    DebuggerStateRole = Qt.UserRole + 2
+    ThreadIdRole = Qt.ItemDataRole.UserRole + 1
+    DebuggerStateRole = Qt.ItemDataRole.UserRole + 2
     
     # Map debug state to icon name
     StateIcon = {
@@ -93,7 +93,7 @@
         self.__mainLayout.setContentsMargins(0, 3, 0, 0)
         self.setLayout(self.__mainLayout)
         
-        self.__mainSplitter = QSplitter(Qt.Vertical, self)
+        self.__mainSplitter = QSplitter(Qt.Orientation.Vertical, self)
         self.__mainLayout.addWidget(self.__mainSplitter)
         
         # add the viewer showing the connected debug backends
@@ -135,7 +135,7 @@
         
         self.globalsFilterEdit = QLineEdit(self.glvWidget)
         self.globalsFilterEdit.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Fixed)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.glvWidgetHLayout.addWidget(self.globalsFilterEdit)
         self.globalsFilterEdit.setToolTip(
             self.tr("Enter regular expression patterns separated by ';'"
@@ -174,7 +174,7 @@
         
         self.stackComboBox = QComboBox(self.lvWidget)
         self.stackComboBox.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Fixed)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.lvWidgetHLayout1.addWidget(self.stackComboBox)
 
         self.sourceButton = QPushButton(self.tr('Source'), self.lvWidget)
@@ -190,7 +190,7 @@
         
         self.localsFilterEdit = QLineEdit(self.lvWidget)
         self.localsFilterEdit.setSizePolicy(
-            QSizePolicy.Expanding, QSizePolicy.Fixed)
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.lvWidgetHLayout2.addWidget(self.localsFilterEdit)
         self.localsFilterEdit.setToolTip(
             self.tr(
@@ -709,7 +709,7 @@
                 .format(debuggerId))
         
         self.__debuggersList.header().resizeSections(
-            QHeaderView.ResizeToContents)
+            QHeaderView.ResizeMode.ResizeToContents)
         
         if self.__debuggersList.topLevelItemCount() == 1:
             # it is the only item, select it as the current one
@@ -723,7 +723,7 @@
         @type str
         """
         debuggerItems = self.__debuggersList.findItems(
-            debuggerId, Qt.MatchExactly)
+            debuggerId, Qt.MatchFlag.MatchExactly)
         if debuggerItems:
             debuggerItem = debuggerItems[0]
             currentItem = self.__debuggersList.currentItem()
@@ -802,7 +802,7 @@
         debuggerItem = None
         if debuggerId:
             foundItems = self.__debuggersList.findItems(
-                debuggerId, Qt.MatchExactly)
+                debuggerId, Qt.MatchFlag.MatchExactly)
             if foundItems:
                 debuggerItem = foundItems[0]
         if debuggerItem is None:
@@ -821,7 +821,7 @@
             debuggerItem.setText(1, stateText)
             
             self.__debuggersList.header().resizeSections(
-                QHeaderView.ResizeToContents)
+                QHeaderView.ResizeMode.ResizeToContents)
     
     def __removeDebugger(self, debuggerId):
         """
@@ -831,7 +831,7 @@
         @type str
         """
         foundItems = self.__debuggersList.findItems(
-            debuggerId, Qt.MatchExactly)
+            debuggerId, Qt.MatchFlag.MatchExactly)
         if foundItems:
             index = self.__debuggersList.indexOfTopLevelItem(foundItems[0])
             itm = self.__debuggersList.takeTopLevelItem(index)
@@ -852,7 +852,7 @@
         debugStatus = -1    # i.e. running
         
         debuggerItems = self.__debuggersList.findItems(
-            debuggerId, Qt.MatchExactly)
+            debuggerId, Qt.MatchFlag.MatchExactly)
         if debuggerItems:
             debuggerItem = debuggerItems[0]
             
@@ -890,7 +890,7 @@
             debuggerItem.setExpanded(debuggerItem.childCount() > 0)
             
             self.__debuggersList.header().resizeSections(
-                QHeaderView.ResizeToContents)
+                QHeaderView.ResizeMode.ResizeToContents)
             self.__debuggersList.header().setStretchLastSection(True)
             self.__doDebuggersListUpdate = True
             
@@ -918,7 +918,7 @@
         debuggerItem = None
         if debuggerId:
             foundItems = self.__debuggersList.findItems(
-                debuggerId, Qt.MatchExactly)
+                debuggerId, Qt.MatchFlag.MatchExactly)
             if foundItems:
                 debuggerItem = foundItems[0]
         if debuggerItem is None:
@@ -944,4 +944,4 @@
                 childItem.setText(1, stateText)
             
             self.__debuggersList.header().resizeSections(
-                QHeaderView.ResizeToContents)
+                QHeaderView.ResizeMode.ResizeToContents)