From 17e875a326a90cb2ea5f59c0f5001068ee5a50c1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Dec 2020 14:10:22 +0530
Subject: [PATCH] More stupid PyQt enums

---
 src/calibre/gui2/dbus_export/demo.py | 7 ++++---
 src/calibre/gui2/tag_browser/view.py | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/dbus_export/demo.py b/src/calibre/gui2/dbus_export/demo.py
index d656935794..2f3c0e9ea9 100644
--- a/src/calibre/gui2/dbus_export/demo.py
+++ b/src/calibre/gui2/dbus_export/demo.py
@@ -45,13 +45,15 @@ class MainWindow(QMainWindow):
         q.triggered.connect(QApplication.quit)
         self.addAction(q)
         QApplication.instance().setWindowIcon(s.standardIcon(QStyle.StandardPixmap.SP_ComputerIcon))
-        for i, icon in zip(range(3), map(s.standardIcon, (QStyle.StandardPixmap.SP_DialogOkButton, QStyle.StandardPixmap.SP_DialogHelpButton, QStyle.StandardPixmap.SP_ArrowUp))):
+        for i, icon in zip(range(3), map(s.standardIcon, (
+                QStyle.StandardPixmap.SP_DialogOkButton, QStyle.StandardPixmap.SP_DialogHelpButton, QStyle.StandardPixmap.SP_ArrowUp))):
             ac = m.addAction('One - &%d' % (i + 1))
             ac.setShortcut(QKeySequence(Qt.Modifier.CTRL | (Qt.Key.Key_1 + i), Qt.Modifier.SHIFT | (Qt.Key.Key_1 + i)))
             ac.setIcon(icon)
         m.addSeparator()
         self.menu_two = m2 = m.addMenu('A &submenu')
-        for i, icon in zip(range(3), map(s.standardIcon, (QStyle.StandardPixmap.SP_DialogOkButton, QStyle.StandardPixmap.SP_DialogCancelButton, QStyle.StandardPixmap.SP_ArrowUp))):
+        for i, icon in zip(range(3), map(s.standardIcon, (
+                QStyle.StandardPixmap.SP_DialogOkButton, QStyle.StandardPixmap.SP_DialogCancelButton, QStyle.StandardPixmap.SP_ArrowUp))):
             ac = m2.addAction('Two - &%d' % (i + 1))
             ac.setShortcut(QKeySequence(Qt.Modifier.CTRL | (Qt.Key.Key_A + i)))
             ac.setIcon(icon)
@@ -111,7 +113,6 @@ class MainWindow(QMainWindow):
 
     def change_icon(self):
         import random
-        s = self.style()
         num = QStyle.StandardPixmap.SP_ComputerIcon
         while num == QStyle.StandardPixmap.SP_ComputerIcon:
             num = random.choice(range(20))
diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index 4b29933d81..664f070e29 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -10,7 +10,7 @@ import os, re, traceback
 from functools import partial
 
 from PyQt5.Qt import (
-    QStyledItemDelegate, Qt, QTreeView, pyqtSignal, QSize, QIcon, QApplication,
+    QStyledItemDelegate, Qt, QTreeView, pyqtSignal, QSize, QIcon, QApplication, QStyle,
     QMenu, QPoint, QToolTip, QCursor, QDrag, QRect, QModelIndex,
     QLinearGradient, QPalette, QColor, QPen, QBrush, QFont, QTimer
 )
@@ -77,7 +77,7 @@ class TagDelegate(QStyledItemDelegate):  # {{{
     def draw_text(self, style, painter, option, widget, index, item):
         tr = style.subElementRect(QStyle.SubElement.SE_ItemViewItemText, option, widget)
         text = index.data(Qt.ItemDataRole.DisplayRole)
-        hover = option.state & style.State_MouseOver
+        hover = option.state & QStyle.StateFlag.State_MouseOver
         is_search = (True if item.type == TagTreeItem.TAG and
                             item.tag.category == 'search' else False)
         if not is_search and (hover or gprefs['tag_browser_show_counts']):