qt6 mypy: Fix remaining unused-ignore issues

4 files changed, 32 insertions, 10 deletions

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 5fdd7c30d..e82922303 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -292,10 +292,18 @@ class ModeManager(QObject):
                             "{}".format(curmode, utils.qualname(parser)))
         match = parser.handle(event, dry_run=dry_run)
 
-        has_modifier = event.modifiers() not in [
-            Qt.KeyboardModifier.NoModifier,
-            Qt.KeyboardModifier.ShiftModifier,
-        ]
+        if machinery.IS_QT5:  # FIXME:v4 needed for Qt 5 typing
+            ignored_modifiers = [
+                cast(Qt.KeyboardModifiers, Qt.KeyboardModifier.NoModifier),
+                cast(Qt.KeyboardModifiers, Qt.KeyboardModifier.ShiftModifier),
+            ]
+        else:
+            ignored_modifiers = [
+                Qt.KeyboardModifier.NoModifier,
+                Qt.KeyboardModifier.ShiftModifier,
+            ]
+        has_modifier = event.modifiers() not in ignored_modifiers
+
         is_non_alnum = has_modifier or not event.text().strip()
 
         forward_unbound_keys = config.cache['input.forward_unbound_keys']
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index dcc04e0c0..d25000816 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -23,8 +23,9 @@ import binascii
 import base64
 import itertools
 import functools
-from typing import List, MutableSequence, Optional, Tuple
+from typing import List, MutableSequence, Optional, Tuple, cast
 
+from qutebrowser.qt import machinery
 from qutebrowser.qt.core import (pyqtBoundSignal, pyqtSlot, QRect, QPoint, QTimer, Qt,
                           QCoreApplication, QEventLoop, QByteArray)
 from qutebrowser.qt.widgets import QWidget, QVBoxLayout, QSizePolicy
@@ -576,7 +577,11 @@ class MainWindow(QWidget):
 
     def _set_decoration(self, hidden):
         """Set the visibility of the window decoration via Qt."""
-        window_flags = Qt.WindowType.Window
+        if machinery.IS_QT5:  # FIXME:v4 needed for Qt 5 typing
+            window_flags = cast(Qt.WindowFlags, Qt.WindowType.Window)
+        else:
+            window_flags = Qt.WindowType.Window
+
         refresh_window = self.isVisible()
         if hidden:
             modifiers = Qt.WindowType.CustomizeWindowHint | Qt.WindowType.NoDropShadowWindowHint
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 925ade795..dae92376b 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -19,8 +19,9 @@
 
 """The commandline in the statusbar."""
 
-from typing import Optional
+from typing import Optional, cast
 
+from qutebrowser.qt import machinery
 from qutebrowser.qt.core import pyqtSignal, pyqtSlot, Qt, QSize
 from qutebrowser.qt.gui import QKeyEvent
 from qutebrowser.qt.widgets import QSizePolicy, QWidget
@@ -269,6 +270,11 @@ class Command(misc.CommandLineEdit):
         Enter/Shift+Enter/etc. will cause QLineEdit to think it's finished
         without command_accept to be called.
         """
+        if machinery.IS_QT5:  # FIXME:v4 needed for Qt 5 typing
+            shift = cast(Qt.KeyboardModifiers, Qt.KeyboardModifier.ShiftModifier)
+        else:
+            shift = Qt.KeyboardModifier.ShiftModifier
+
         text = self.text()
         if text in modeparsers.STARTCHARS and e.key() == Qt.Key.Key_Backspace:
             e.accept()
@@ -276,7 +282,7 @@ class Command(misc.CommandLineEdit):
                           'prefix deleted')
         elif e.key() == Qt.Key.Key_Return:
             e.ignore()
-        elif e.key() == Qt.Key.Key_Insert and e.modifiers() == Qt.KeyboardModifier.ShiftModifier:
+        elif e.key() == Qt.Key.Key_Insert and e.modifiers() == shift:
             try:
                 text = utils.get_clipboard(selection=True, fallback=True)
             except utils.ClipboardError:
diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py
index 64ad1a260..1b2ac3d8a 100644
--- a/qutebrowser/misc/ipc.py
+++ b/qutebrowser/misc/ipc.py
@@ -276,12 +276,15 @@ class IPCServer(QObject):
 
         socket.errorOccurred.connect(self.on_error)
 
-        if socket.error() not in [
+        # FIXME:v4 Ignore needed due to overloaded signal/method in Qt 5
+        socket_error = socket.error()  # type: ignore[operator,unused-ignore]
+        if socket_error not in [
             QLocalSocket.LocalSocketError.UnknownSocketError,
             QLocalSocket.LocalSocketError.PeerClosedError
         ]:
             log.ipc.debug("We got an error immediately.")
-            self.on_error(socket.error())
+            self.on_error(socket_error)
+
         socket.disconnected.connect(self.on_disconnected)
         if socket.state() == QLocalSocket.LocalSocketState.UnconnectedState:
             log.ipc.debug("Socket was disconnected immediately.")