Fix Qt.UserRole access warning

novelwriter/dialogs/docmerge.py

@@ -41,6 +41,8 @@ logger = logging.getLogger(__name__)
 
 class GuiDocMerge(QDialog):
 
+    D_HANDLE = Qt.ItemDataRole.UserRole
+
     def __init__(self, mainGui, sHandle, itemList):
         super().__init__(parent=mainGui)
 
@@ -122,7 +124,7 @@ class GuiDocMerge(QDialog):
         for i in range(self.listBox.count()):
             item = self.listBox.item(i)
             if item is not None and item.checkState() == Qt.Checked:
-                finalItems.append(item.data(Qt.UserRole))
+                finalItems.append(item.data(self.D_HANDLE))
 
         self._data["moveToTrash"] = self.trashSwitch.isChecked()
         self._data["finalItems"] = finalItems
@@ -166,7 +168,7 @@ class GuiDocMerge(QDialog):
             newItem = QListWidgetItem()
             newItem.setIcon(itemIcon)
             newItem.setText(nwItem.itemName)
-            newItem.setData(Qt.UserRole, tHandle)
+            newItem.setData(self.D_HANDLE, tHandle)
             newItem.setCheckState(Qt.Checked)
 
             self.listBox.addItem(newItem)

novelwriter/dialogs/docsplit.py

@@ -41,9 +41,9 @@ logger = logging.getLogger(__name__)
 
 class GuiDocSplit(QDialog):
 
-    LINE_ROLE = Qt.UserRole
-    LEVEL_ROLE = Qt.UserRole + 1
-    LABEL_ROLE = Qt.UserRole + 2
+    LINE_ROLE  = Qt.ItemDataRole.UserRole
+    LEVEL_ROLE = Qt.ItemDataRole.UserRole + 1
+    LABEL_ROLE = Qt.ItemDataRole.UserRole + 2
 
     def __init__(self, mainGui, sHandle):
         super().__init__(parent=mainGui)

novelwriter/dialogs/projload.py

@@ -53,6 +53,8 @@ class GuiProjectLoad(QDialog):
     C_COUNT = 1
     C_TIME  = 2
 
+    D_PATH = Qt.ItemDataRole.UserRole
+
     def __init__(self, mainGui):
         super().__init__(parent=mainGui)
 
@@ -167,7 +169,7 @@ class GuiProjectLoad(QDialog):
 
         selItems = self.listBox.selectedItems()
         if selItems:
-            self.openPath = selItems[0].data(self.C_NAME, Qt.UserRole)
+            self.openPath = selItems[0].data(self.C_NAME, self.D_PATH)
             self.openState = self.OPEN_STATE
             self.accept()
 
@@ -178,7 +180,7 @@ class GuiProjectLoad(QDialog):
         """
         selList = self.listBox.selectedItems()
         if selList:
-            self.selPath.setText(selList[0].data(self.C_NAME, Qt.UserRole))
+            self.selPath.setText(selList[0].data(self.C_NAME, self.D_PATH))
         return
 
     def _doBrowse(self):
@@ -232,7 +234,7 @@ class GuiProjectLoad(QDialog):
             )
             if msgYes:
                 CONFIG.recentProjects.remove(
-                    selList[0].data(self.C_NAME, Qt.UserRole)
+                    selList[0].data(self.C_NAME, self.D_PATH)
                 )
                 self._populateList()
 
@@ -274,12 +276,12 @@ class GuiProjectLoad(QDialog):
             newItem = QTreeWidgetItem([""]*4)
             newItem.setIcon(self.C_NAME, nwxIcon)
             newItem.setText(self.C_NAME, title)
-            newItem.setData(self.C_NAME, Qt.UserRole, path)
+            newItem.setData(self.C_NAME, self.D_PATH, path)
             newItem.setText(self.C_COUNT, formatInt(words))
             newItem.setText(self.C_TIME, datetime.fromtimestamp(time).strftime("%x %X"))
-            newItem.setTextAlignment(self.C_NAME,  Qt.AlignLeft  | Qt.AlignVCenter)
+            newItem.setTextAlignment(self.C_NAME, Qt.AlignLeft | Qt.AlignVCenter)
             newItem.setTextAlignment(self.C_COUNT, Qt.AlignRight | Qt.AlignVCenter)
-            newItem.setTextAlignment(self.C_TIME,  Qt.AlignRight | Qt.AlignVCenter)
+            newItem.setTextAlignment(self.C_TIME, Qt.AlignRight | Qt.AlignVCenter)
             newItem.setFont(self.C_TIME, self.mainTheme.guiFontFixed)
             self.listBox.addTopLevelItem(newItem)
 

novelwriter/dialogs/projsettings.py

@@ -277,9 +277,9 @@ class GuiProjectEditStatus(QWidget):
     COL_LABEL = 0
     COL_USAGE = 1
 
-    KEY_ROLE = Qt.UserRole
-    COL_ROLE = Qt.UserRole + 1
-    NUM_ROLE = Qt.UserRole + 2
+    KEY_ROLE = Qt.ItemDataRole.UserRole
+    COL_ROLE = Qt.ItemDataRole.UserRole + 1
+    NUM_ROLE = Qt.ItemDataRole.UserRole + 2
 
     def __init__(self, projGui, isStatus):
         super().__init__(parent=projGui)

novelwriter/dialogs/quotes.py

@@ -42,6 +42,8 @@ class GuiQuoteSelect(QDialog):
 
     selectedQuote = ""
 
+    D_KEY = Qt.ItemDataRole.UserRole
+
     def __init__(self, parent=None, currentQuote='"'):
         super().__init__(parent=parent)
 
@@ -75,7 +77,7 @@ class GuiQuoteSelect(QDialog):
             theText = "[ %s ] %s" % (sKey, trConst(sLabel))
             minSize = max(minSize, qMetrics.boundingRect(theText).width())
             qtItem = QListWidgetItem(theText)
-            qtItem.setData(Qt.UserRole, sKey)
+            qtItem.setData(self.D_KEY, sKey)
             self.listBox.addItem(qtItem)
             if sKey == currentQuote:
                 self.listBox.setCurrentItem(qtItem)
@@ -111,7 +113,7 @@ class GuiQuoteSelect(QDialog):
         """
         selItems = self.listBox.selectedItems()
         if selItems:
-            theSymbol = selItems[0].data(Qt.UserRole)
+            theSymbol = selItems[0].data(self.D_KEY)
             self.previewLabel.setText(theSymbol)
             self.selectedQuote = theSymbol
         return