From 1b8a44ac2686a9ace2443f8ab7db6a04edc9ee11 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 12 Jun 2014 15:13:26 +0200
Subject: [PATCH] Simplify get_qt_args

---
 qutebrowser/test/utils/test_misc.py |  5 -----
 qutebrowser/utils/misc.py           | 11 +++++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/test/utils/test_misc.py b/qutebrowser/test/utils/test_misc.py
index d9b042b3f..5414a53a2 100644
--- a/qutebrowser/test/utils/test_misc.py
+++ b/qutebrowser/test/utils/test_misc.py
@@ -430,11 +430,6 @@ class GetQtArgsTests(TestCase):
                                                  '-stylesheet', 'foobar',
                                                  '-reverse'])
 
-    def test_qt_unknown(self):
-        """Test commandline with unknown Qt argument."""
-        ns = self._namespace(['--qt-foo'], flags=['--qt-foo'])
-        self.assertEqual(utils.get_qt_args(ns), [sys.argv[0]])
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/qutebrowser/utils/misc.py b/qutebrowser/utils/misc.py
index e2527aa0a..f398ca8f7 100644
--- a/qutebrowser/utils/misc.py
+++ b/qutebrowser/utils/misc.py
@@ -272,16 +272,15 @@ def get_qt_args(namespace):
         The argv list to be passed to Qt.
     """
     argv = [sys.argv[0]]
-    qt_args = ('style', 'stylesheet', 'widget-count', 'reverse',
-               'qmljsdebugger')
-    for argname in qt_args:
-        val = getattr(namespace, 'qt_' + argname, None)
+    for argname, val in vars(namespace).items():
+        if not argname.startswith('qt_'):
+            pass
         if val is None:
             # flag/argument not given
             continue
         elif val is True:
-            argv.append('-' + argname)
+            argv.append('-' + argname[3:])
         else:
-            argv.append('-' + argname)
+            argv.append('-' + argname[3:])
             argv.append(val[0])
     return argv