From edc9d0810cf83f314aa96253b86c9a6813774002 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 9 May 2014 17:01:05 +0200 Subject: [PATCH] Use QCoreApplication.instance() --- TODO | 1 - qutebrowser/browser/webpage.py | 5 +++-- qutebrowser/commands/_command.py | 5 ++--- qutebrowser/config/config.py | 5 ++--- qutebrowser/keyinput/modeman.py | 8 ++++---- qutebrowser/models/cmdhistory.py | 5 ++--- qutebrowser/utils/message.py | 5 ++--- qutebrowser/widgets/mainwindow.py | 10 +++++----- 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/TODO b/TODO index 57f26c09e..1e5160401 100644 --- a/TODO +++ b/TODO @@ -124,7 +124,6 @@ Minor features ============== - Display metavars for commands in input bar. -- Use QCoreApplication instead of QApplication for .instance() - count support for special keys - --set-as-default argument - Make inspector height resizable diff --git a/qutebrowser/browser/webpage.py b/qutebrowser/browser/webpage.py index 25c677fc7..a2fe43bb4 100644 --- a/qutebrowser/browser/webpage.py +++ b/qutebrowser/browser/webpage.py @@ -18,7 +18,7 @@ """The main browser widgets.""" import sip -from PyQt5.QtWidgets import QApplication +from PyQt5.QtCore import QCoreApplication from PyQt5.QtNetwork import QNetworkReply from PyQt5.QtWebKitWidgets import QWebPage @@ -41,7 +41,8 @@ class BrowserPage(QWebPage): self._extension_handlers = { QWebPage.ErrorPageExtension: self._handle_errorpage, } - self.setNetworkAccessManager(QApplication.instance().networkmanager) + self.setNetworkAccessManager( + QCoreApplication.instance().networkmanager) def _handle_errorpage(self, opt, out): """Display an error page if needed. diff --git a/qutebrowser/commands/_command.py b/qutebrowser/commands/_command.py index 57a83d087..b4bec9c77 100644 --- a/qutebrowser/commands/_command.py +++ b/qutebrowser/commands/_command.py @@ -22,8 +22,7 @@ import logging from qutebrowser.commands._exceptions import (ArgumentCountError, PrerequisitesError) -from PyQt5.QtCore import pyqtSignal, QObject -from PyQt5.QtWidgets import QApplication +from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication from PyQt5.QtWebKit import QWebSettings @@ -85,7 +84,7 @@ class Command(QObject): """ # We don't use modeman.instance() here to avoid a circular import # of qutebrowser.keyinput.modeman. - curmode = QApplication.instance().modeman.mode + curmode = QCoreApplication.instance().modeman.mode if self.modes is not None and curmode not in self.modes: raise PrerequisitesError("{}: This command is only allowed in {} " "mode.".format(self.name, diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 1edfa1434..6d3151ca5 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -30,8 +30,7 @@ import configparser from configparser import ExtendedInterpolation from collections.abc import MutableMapping -from PyQt5.QtCore import pyqtSignal, QObject -from PyQt5.QtWidgets import QApplication +from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication import qutebrowser.config.configdata as configdata import qutebrowser.commands.utils as cmdutils @@ -42,7 +41,7 @@ from qutebrowser.config._conftypes import ValidationError def instance(): """Get the global config instance.""" - return QApplication.instance().config + return QCoreApplication.instance().config def get(*args, **kwargs): diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py index a8b74ce4a..49a4aa787 100644 --- a/qutebrowser/keyinput/modeman.py +++ b/qutebrowser/keyinput/modeman.py @@ -24,8 +24,8 @@ Module attributes: import logging from PyQt5.QtGui import QWindow -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent -from PyQt5.QtWidgets import QApplication +from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QEvent, + QCoreApplication) import qutebrowser.config.config as config import qutebrowser.commands.utils as cmdutils @@ -34,7 +34,7 @@ import qutebrowser.utils.debug as debug def instance(): """Get the global modeman instance.""" - return QApplication.instance().modeman + return QCoreApplication.instance().modeman def enter(mode, reason=None): @@ -259,7 +259,7 @@ class ModeManager(QObject): logging.debug("Ignoring event {} for {}".format( debug.EVENTS[typ], obj.__class__.__name__)) return False - if QApplication.instance().activeWindow() is not self.mainwindow: + if QCoreApplication.instance().activeWindow() is not self.mainwindow: # Some other window (print dialog, etc.) is focused so we pass # the event through. return False diff --git a/qutebrowser/models/cmdhistory.py b/qutebrowser/models/cmdhistory.py index a410a0299..c4bd74e69 100644 --- a/qutebrowser/models/cmdhistory.py +++ b/qutebrowser/models/cmdhistory.py @@ -19,8 +19,7 @@ import logging -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QApplication +from PyQt5.QtCore import pyqtSlot, QCoreApplication from qutebrowser.utils.usertypes import NeighborList @@ -51,7 +50,7 @@ class History: def __init__(self): self._tmphist = None - history = QApplication.instance().cmd_history.data + history = QCoreApplication.instance().cmd_history.data if history is None: self._history = [] else: diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py index 337707ce7..9221bff7e 100644 --- a/qutebrowser/utils/message.py +++ b/qutebrowser/utils/message.py @@ -19,13 +19,12 @@ import logging -from PyQt5.QtCore import QObject, pyqtSignal -from PyQt5.QtWidgets import QApplication +from PyQt5.QtCore import QObject, pyqtSignal, QCoreApplication def instance(): """Get the global messagebridge instance.""" - return QApplication.instance().messagebridge + return QCoreApplication.instance().messagebridge def error(message): diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py index c5a75bb84..97bd8ba1d 100644 --- a/qutebrowser/widgets/mainwindow.py +++ b/qutebrowser/widgets/mainwindow.py @@ -20,8 +20,8 @@ import binascii from base64 import b64decode -from PyQt5.QtCore import pyqtSlot, QRect, QPoint -from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication +from PyQt5.QtCore import pyqtSlot, QRect, QPoint, QCoreApplication +from PyQt5.QtWidgets import QWidget, QVBoxLayout from PyQt5.QtWebKitWidgets import QWebInspector from qutebrowser.widgets._statusbar import StatusBar @@ -50,9 +50,9 @@ class MainWindow(QWidget): self.setWindowTitle('qutebrowser') try: - geom = b64decode( - QApplication.instance().stateconfig['geometry']['mainwindow'], - validate=True) + stateconf = QCoreApplication.instance().stateconfig + geom = b64decode(stateconf['geometry']['mainwindow'], + validate=True) except (KeyError, binascii.Error): self._set_default_geometry() else: