From 7063f2445c2b5aa562ced690e4851e20c51d8788 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 7 Aug 2014 14:39:42 +0200
Subject: [PATCH] cmdhistory: Make History more modular.

---
 qutebrowser/models/cmdhistory.py         | 12 ++++++++----
 qutebrowser/widgets/statusbar/command.py |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/models/cmdhistory.py b/qutebrowser/models/cmdhistory.py
index 576492f9b..8e1bfb024 100644
--- a/qutebrowser/models/cmdhistory.py
+++ b/qutebrowser/models/cmdhistory.py
@@ -19,10 +19,10 @@
 
 """Command history for the status bar."""
 
-from PyQt5.QtCore import pyqtSlot, QCoreApplication
+from PyQt5.QtCore import pyqtSlot
 
 from qutebrowser.utils.usertypes import NeighborList
-from qutebrowser.utils.log import statusbar as logger
+from qutebrowser.utils.log import misc as logger
 
 
 class HistoryEmptyError(Exception):
@@ -49,9 +49,13 @@ class History:
         _tmphist: Temporary history for history browsing (as NeighborList)
     """
 
-    def __init__(self):
+    def __init__(self, history=None):
+        """Constructor.
+
+        Args:
+            history: The initial history to set.
+        """
         self._tmphist = None
-        history = QCoreApplication.instance().cmd_history.data
         if history is None:
             self._history = []
         else:
diff --git a/qutebrowser/widgets/statusbar/command.py b/qutebrowser/widgets/statusbar/command.py
index 07acfe3af..13086b149 100644
--- a/qutebrowser/widgets/statusbar/command.py
+++ b/qutebrowser/widgets/statusbar/command.py
@@ -20,7 +20,7 @@
 """The commandline in the statusbar."""
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot
-from PyQt5.QtWidgets import QSizePolicy
+from PyQt5.QtWidgets import QSizePolicy, QApplication
 from PyQt5.QtGui import QValidator
 
 import qutebrowser.keyinput.modeman as modeman
@@ -81,7 +81,7 @@ class Command(MinimalLineEdit):
     def __init__(self, parent=None):
         super().__init__(parent)
         self.cursor_part = 0
-        self.history = History()
+        self.history = History(QApplication.instance().cmd_history.data)
         self._validator = _CommandValidator(self)
         self._empty_item_idx = None
         self.setValidator(self._validator)