More Qt6 fixes

migaku-official · Jun 14, 2023 · ba774c4 · ba774c4
1 parent 6cd4a70
commit ba774c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/addon/create_cards_from_notes_dialog.py b/addon/create_cards_from_notes_dialog.py
@@ -61,8 +61,8 @@ def create_cards(self):
         checked_fields_states = {}
         for i in range(self.list_box.count()):
             itm = self.list_box.item(i)
-            field_name = itm.data(Qt.DisplayRole)
-            field_checked = itm.checkState() == Qt.Checked
+            field_name = itm.data(Qt.ItemDataRole.DisplayRole)
+            field_checked = itm.checkState() == Qt.CheckState.Checked
             if field_checked:
                 checked_fields.add(field_name)
             checked_fields_states[field_name] = field_checked

diff --git a/addon/kanji_confirm_dialog.py b/addon/kanji_confirm_dialog.py
@@ -35,9 +35,9 @@ def data(self, idx, role):
         if not idx.isValid():
             return QVariant()
         k = self.kanji[idx.row()]
-        if role == Qt.DisplayRole:
+        if role == Qt.ItemDataRole.DisplayRole:
             return str(k)
-        if role == Qt.BackgroundRole:
+        if role == Qt.ItemDataRole.BackgroundRole:
             s = self.states[k]
             return QColor(self.state_colors[s])
         return QVariant()
@@ -64,7 +64,7 @@ def with_state(self, state):
 
     def to_add(self):
         return self.with_state(0)
-    
+
     def to_mark(self):
         return self.with_state(1)
 
@@ -78,21 +78,21 @@ def __init__(self):
         self._model = KanjiMarkModel()
         self.setModel(self._model)
 
-        self.setFlow(QListView.LeftToRight)
-        self.setResizeMode(QListView.Adjust)
+        self.setFlow(QListView.Flow.LeftToRight)
+        self.setResizeMode(QListView.ResizeMode.Adjust)
         font = self.font()
         font.setPixelSize(35)
         self.setFont(font)
         self.setSpacing(5)
-        self.setViewMode(QListView.IconMode)
-        self.setSelectionMode(QAbstractItemView.NoSelection)
+        self.setViewMode(QListView.ViewMode.IconMode)
+        self.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
 
     def mousePressEvent(self, event):
         pos = event.pos()
         idx = self.indexAt(pos)
 
         if event.modifiers() == Qt.ShiftModifier:
-            txt = self._model.data(idx, Qt.DisplayRole)
+            txt = self._model.data(idx, Qt.ItemDataRole.DisplayRole)
             if txt:
                 LookupWindow.open(txt)
         else:

diff --git a/addon/mark_known_dialog.py b/addon/mark_known_dialog.py
@@ -167,8 +167,8 @@ def on_ok(self):
         checked_fields = set()
         for i in range(self.list_box.count()):
             itm = self.list_box.item(i)
-            field_name = itm.data(Qt.DisplayRole)
-            field_checked = itm.checkState() == Qt.Checked
+            field_name = itm.data(Qt.ItemDataRole.DisplayRole)
+            field_checked = itm.checkState() == Qt.CheckState.Checked
             if field_checked:
                 checked_fields.add(field_name)
 

diff --git a/addon/util.py b/addon/util.py
@@ -73,7 +73,7 @@ def error_msg_on_error(parent, func, *args, **kwargs):
 
 
 def raise_window(window: QWidget):
-    window.setWindowState( (window.windowState() & ~Qt.WindowMinimized) | Qt.WindowActive)
+    window.setWindowState( (window.windowState() & ~Qt.WindowState.WindowMinimized) | Qt.WindowState.WindowActive)
     window.raise_()
     window.activateWindow()