From 6dd4ef6c92bc6f59b892cad3d50122ff4f85dec2 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Tue, 30 Aug 2022 15:26:05 +0100 Subject: [PATCH] enum fix: Qt.DisplayRole => Qt.ItemDataRole.DisplayRole --- src/calibre/gui2/dialogs/quickview.py | 2 +- src/calibre/gui2/preferences/look_feel.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py index 3da03c079a..5a1d95213d 100644 --- a/src/calibre/gui2/dialogs/quickview.py +++ b/src/calibre/gui2/dialogs/quickview.py @@ -94,7 +94,7 @@ class TableItem(QTableWidgetItem): def data(self, role): self.get_data() - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: return self.val return QTableWidgetItem.data(self, role) diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index 73deaa876e..eff13e1890 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -793,7 +793,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): if v == 0: break item = QListWidgetItem(icon_map[v], choices[v-1][1]) - item.setData(Qt.UserRole, choices[v-1][0]) + item.setData(Qt.ItemDataRole.UserRole, choices[v-1][0]) self.tb_search_order.addItem(item) node = v @@ -821,7 +821,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): # the option order node = 0 for i in range(0, 4): - v = self.tb_search_order.item(i).data(Qt.UserRole) + v = self.tb_search_order.item(i).data(Qt.ItemDataRole.UserRole) # JSON dumps converts integer keys to strings, so do it explicitly t[str(node)] = v node = v