From 04be586bca5b66352c3d049316c431755807e1c4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Sep 2014 22:37:41 +0200
Subject: [PATCH] Use object registry for keyconfig.

---
 qutebrowser/app.py                    | 20 ++++++++++++--------
 qutebrowser/keyinput/basekeyparser.py |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 0b3d45d74..b8408d1ca 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -91,7 +91,6 @@ class Application(QApplication):
         self._keyparsers = None
         self._crashdlg = None
         self._crashlogfile = None
-        self.keyconfig = None
 
         sys.excepthook = self._exception_hook
 
@@ -190,8 +189,7 @@ class Application(QApplication):
         else:
             self.registry['config'] = config_obj
         try:
-            self.keyconfig = keyconfparser.KeyConfigParser(
-                confdir, 'keys.conf')
+            keyconfig = keyconfparser.KeyConfigParser(confdir, 'keys.conf')
         except keyconfparser.KeyConfigError as e:
             log.init.exception(e)
             errstr = "Error while reading key config:\n"
@@ -203,6 +201,8 @@ class Application(QApplication):
             msgbox.exec_()
             # We didn't really initialize much so far, so we just quit hard.
             sys.exit(1)
+        else:
+            self.registry['keyconfig'] = keyconfig
         stateconfig = iniparsers.ReadWriteConfigParser(confdir, 'state')
         self.registry['stateconfig'] = stateconfig
         cmd_history = lineparser.LineConfigParser(
@@ -385,6 +385,7 @@ class Application(QApplication):
         cmd_history = self.registry['cmd_history']
         downloadmanager = self.registry['downloadmanager']
         config_obj = self.registry['config']
+        keyconfig = self.registry['keyconfig']
 
         # misc
         self.lastWindowClosed.connect(self.shutdown)
@@ -428,7 +429,7 @@ class Application(QApplication):
                     websettings, modeman, status, status.txt):
             config_obj.changed.connect(obj.on_config_changed)
         for obj in kp.values():
-            self.keyconfig.changed.connect(obj.on_keyconfig_changed)
+            keyconfig.changed.connect(obj.on_keyconfig_changed)
 
         # statusbar
         # FIXME some of these probably only should be triggered on mainframe
@@ -770,10 +771,13 @@ class Application(QApplication):
         else:
             to_save = []
             if config.get('general', 'auto-save-config'):
-                if hasattr(self, 'config'):
-                    to_save.append(("config", config_obj.save))
-                if hasattr(self, 'keyconfig'):
-                    to_save.append(("keyconfig", self.keyconfig.save))
+                to_save.append(("config", config_obj.save))
+                try:
+                    keyconfig = self.registry['keyconfig']
+                except KeyError:
+                    pass
+                else:
+                    to_save.append(("keyconfig", keyconfig.save))
             to_save += [("window geometry", self._save_geometry),
                         ("quickmarks", quickmarks.save)]
             try:
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index bffec833e..65ef08909 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -23,7 +23,7 @@ import re
 import string
 import functools
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QObject, QCoreApplication
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QObject
 
 from qutebrowser.config import config
 from qutebrowser.utils import usertypes, log, utils
@@ -321,7 +321,7 @@ class BaseKeyParser(QObject):
             self._modename = modename
         self.bindings = {}
         self.special_bindings = {}
-        keyconfparser = QCoreApplication.instance().keyconfig
+        keyconfparser = utils.get_object('keyconfig')
         for (key, cmd) in keyconfparser.get_bindings_for(modename).items():
             if not cmd:
                 continue