From 089e1ee91b3f4291953dc264ebe8485904fe484c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 16 Jun 2017 18:10:04 +0200
Subject: [PATCH] Rewrite various references to old settings

---
 doc/help/commands.asciidoc                     |  4 ++--
 qutebrowser/browser/commands.py                | 16 ++++++++--------
 qutebrowser/browser/downloads.py               |  2 +-
 qutebrowser/browser/hints.py                   |  2 +-
 qutebrowser/browser/qtnetworkdownloads.py      |  2 +-
 .../browser/webengine/webenginesettings.py     |  2 +-
 qutebrowser/config/configdata.yml              |  4 ++--
 qutebrowser/html/no_pdfjs.html                 |  4 ++--
 qutebrowser/mainwindow/tabbedbrowser.py        |  2 +-
 qutebrowser/mainwindow/tabwidget.py            |  2 +-
 qutebrowser/misc/sessions.py                   |  2 +-
 qutebrowser/utils/utils.py                     |  5 ++---
 tests/end2end/features/keyinput.feature        |  2 +-
 tests/end2end/features/misc.feature            | 18 +++++-------------
 tests/end2end/features/tabs.feature            | 12 ++++++------
 tests/end2end/features/test_editor_bdd.py      |  4 ++--
 16 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 05bf3ad93..0d08253b7 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -338,7 +338,7 @@ Show help about a command or setting.
 * +'topic'+: The topic to show help for. 
 
  - :__command__ for commands.
- - __section__\->__option__ for settings.
+ - __option.foo.bar__ for settings.
 
 
 ==== optional arguments
@@ -408,7 +408,7 @@ Start hinting.
 * +*-m*+, +*--mode*+: The hinting mode to use. 
 
  - `number`: Use numeric hints.
- - `letter`: Use the chars in the hints->chars settings.
+ - `letter`: Use the chars in the hints.chars settings.
  - `word`: Use hint words based on the html elements and the
  extra words.
  
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0b46730f8..938b62f29 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -178,7 +178,7 @@ class CommandDispatcher:
             prev: Force selecting the tab before the current tab.
             next_: Force selecting the tab after the current tab.
             opposite: Force selecting the tab in the opposite direction of
-                      what's configured in 'tabs->select-on-remove'.
+                      what's configured in 'tabs.select_on_remove'.
 
         Return:
             QTabBar.SelectLeftTab, QTabBar.SelectRightTab, or None if no change
@@ -197,7 +197,7 @@ class CommandDispatcher:
                 return QTabBar.SelectLeftTab
             elif conf_selection == QTabBar.SelectPreviousTab:
                 raise cmdexc.CommandError(
-                    "-o is not supported with 'tabs->select-on-remove' set to "
+                    "-o is not supported with 'tabs.select_on_remove' set to "
                     "'last-used'!")
             else:  # pragma: no cover
                 raise ValueError("Invalid select-on-remove value "
@@ -212,7 +212,7 @@ class CommandDispatcher:
             prev: Force selecting the tab before the current tab.
             next_: Force selecting the tab after the current tab.
             opposite: Force selecting the tab in the opposite direction of
-                      what's configured in 'tabs->select-on-remove'.
+                      what's configured in 'tabs.select_on_remove'.
             count: The tab index to close, or None
         """
         tabbar = self._tabbed_browser.tabBar()
@@ -250,7 +250,7 @@ class CommandDispatcher:
             prev: Force selecting the tab before the current tab.
             next_: Force selecting the tab after the current tab.
             opposite: Force selecting the tab in the opposite direction of
-                      what's configured in 'tabs->select-on-remove'.
+                      what's configured in 'tabs.select_on_remove'.
             force: Avoid confirmation for pinned tabs.
             count: The tab index to close, or None
         """
@@ -268,7 +268,7 @@ class CommandDispatcher:
     def tab_pin(self, count=None):
         """Pin/Unpin the current/[count]th tab.
 
-        Pinning a tab shrinks it to tabs->pinned-width size.
+        Pinning a tab shrinks it to `tabs.width.pinned` size.
         Attempting to close a pinned tab will cause a confirmation,
         unless --force is passed.
 
@@ -1530,7 +1530,7 @@ class CommandDispatcher:
             topic: The topic to show help for.
 
                    - :__command__ for commands.
-                   - __section__\->__option__ for settings.
+                   - __section__.__option__ for settings.
         """
         if topic is None:
             path = 'index.html'
@@ -1607,7 +1607,7 @@ class CommandDispatcher:
         """Open an external editor with the currently selected form field.
 
         The editor which should be launched can be configured via the
-        `general -> editor` config option.
+        `editor.command` config option.
         """
         tab = self._current_widget()
         tab.elements.find_focused(self._open_editor_cb)
@@ -2100,7 +2100,7 @@ class CommandDispatcher:
         """Navigate to a url formed in an external editor.
 
         The editor which should be launched can be configured via the
-        `general -> editor` config option.
+        `editor.command` config option.
 
         Args:
             url: URL to edit; defaults to the current page url.
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index c642a56ab..de16a60ff 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -88,7 +88,7 @@ def immediate_download_path(prompt_download_directory=None):
     Args:
         prompt_download_directory: If this is something else than None, it
                                    will overwrite the
-                                   storage->prompt-download-directory setting.
+                                   downloads.location.prompt setting.
     """
     if prompt_download_directory is None:
         prompt_download_directory = config.val.downloads.location.prompt
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 80b253512..32f52c161 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -649,7 +649,7 @@ class HintManager(QObject):
             mode: The hinting mode to use.
 
                 - `number`: Use numeric hints.
-                - `letter`: Use the chars in the hints->chars settings.
+                - `letter`: Use the chars in the hints.chars setting.
                 - `word`: Use hint words based on the html elements and the
                           extra words.
 
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index bf41540e1..d5f232e8a 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -480,7 +480,7 @@ class DownloadManager(downloads.AbstractDownloadManager):
             reply: The QNetworkReply to download.
             target: Where to save the download as downloads.DownloadTarget.
             auto_remove: Whether to remove the download even if
-                         ui -> remove-finished-downloads is set to -1.
+                         downloads.remove_finished is set to -1.
 
         Return:
             The created DownloadItem.
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 3552a55c2..f903b180b 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -110,7 +110,7 @@ class DefaultProfileSetter(websettings.Base):
 
 class PersistentCookiePolicy(DefaultProfileSetter):
 
-    """The cookies -> store setting is different from other settings."""
+    """The content.cookies.store setting is different from other settings."""
 
     def __init__(self):
         super().__init__('setPersistentCookiesPolicy')
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 2e62d9086..38b563dc5 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1016,7 +1016,7 @@ tabs.favicons.scale:
     name: Float
     minval: 0.0
   desc: Scale for favicons in the tab bar. The tab size is unchanged, so big favicons
-    also require extra `tabs->padding`.
+    also require extra `tabs.padding`.
 
 tabs.favicons.show:
   default: true
@@ -1092,7 +1092,7 @@ tabs.show:
 tabs.show_switching_delay:
   default: 800
   type: Int
-  desc: "Time to show the tab bar before hiding it when tabs->show is set to
+  desc: "Time to show the tab bar before hiding it when tabs.show is set to
     'switching'."
 
 tabs.tabs_are_windows:
diff --git a/qutebrowser/html/no_pdfjs.html b/qutebrowser/html/no_pdfjs.html
index d6206e8b2..c38273f33 100644
--- a/qutebrowser/html/no_pdfjs.html
+++ b/qutebrowser/html/no_pdfjs.html
@@ -74,7 +74,7 @@ li {
         <p>Error while opening {{ url }}<br>
         <p id="error-message-text" style="color: #a31a1a;">qutebrowser can't find a suitable pdf.js installation</p></p>
 
-        <p>It looks like you set <code>content -> enable-pdfjs</code>
+        <p>It looks like you set <code>content.pdfjs</code>
           to <em>true</em> but qutebrowser can't find the required files.</p>
 
         <br>
@@ -82,7 +82,7 @@ li {
         <h2>Possible fixes</h2>
         <ul>
           <li>
-            Disable <code>content -> enable-pdfjs</code> and reload the page.
+            Disable <code>content.pdfjs</code> and reload the page.
             You will need to download the pdf-file and open it with an external
             tool instead.
           </li>
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 2d1b2d5ed..5fb47aa97 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -62,7 +62,7 @@ class TabbedBrowser(tabwidget.TabWidget):
         _filter: A SignalFilter instance.
         _now_focused: The tab which is focused now.
         _tab_insert_idx_left: Where to insert a new tab with
-                         tabbar -> new-tab-position set to 'prev'.
+                              tabs.new_tab_position set to 'prev'.
         _tab_insert_idx_right: Same as above, for 'next'.
         _undo_stack: List of UndoEntry namedtuples of closed tabs.
         shutting_down: Whether we're currently shutting down.
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 7eb354351..491a471c0 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -339,7 +339,7 @@ class TabBar(QTabBar):
             self.update()
 
     def _on_show_switching_delay_changed(self):
-        """Set timer interval when tabs->show-switching-delay got changed."""
+        """Set timer interval when tabs.show_switching_delay got changed."""
         self._auto_hide_timer.setInterval(config.val.tabs.show_switching_delay)
 
     def on_current_changed(self):
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 3768d53cd..c3e720ce0 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -469,7 +469,7 @@ class SessionManager(QObject):
 
         Args:
             name: The name of the session. If not given, the session configured
-                  in general -> session-default-name is saved.
+                  in session_default_name is saved.
             current: Save the current session instead of the default.
             quiet: Don't show confirmation message.
             force: Force saving internal sessions (starting with an underline).
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index f6b1d5a9f..bd96de2aa 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -823,9 +823,8 @@ def random_port():
 def open_file(filename, cmdline=None):
     """Open the given file.
 
-    If cmdline is not given, general->default-open-dispatcher is used.
-    If default-open-dispatcher is unset, the system's default application is
-    used.
+    If cmdline is not given, downloads.open_dispatcher is used.
+    If open_dispatcher is unset, the system's default application is used.
 
     Args:
         filename: The filename to open.
diff --git a/tests/end2end/features/keyinput.feature b/tests/end2end/features/keyinput.feature
index f63f9306a..cabcfe2ee 100644
--- a/tests/end2end/features/keyinput.feature
+++ b/tests/end2end/features/keyinput.feature
@@ -117,7 +117,7 @@ Feature: Keyboard input
         And I press the keys "bar"
         Then the message "test12-2" should be shown
 
-    # input -> forward-unbound-keys
+    # input.forward_unbound_keys
 
     Scenario: Forwarding all keys
         When I open data/keyinput/log.html
diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature
index 3d4a0ca51..2dcd3408f 100644
--- a/tests/end2end/features/misc.feature
+++ b/tests/end2end/features/misc.feature
@@ -283,22 +283,14 @@ Feature: Various utility commands.
     Scenario: :help with setting
         When the documentation is up to date
         And I run :tab-only
-        And I run :help general->editor
-        And I wait until qute://help/settings.html#general-editor is loaded
+        And I run :help editor.command
+        And I wait until qute://help/settings.html#editor.command is loaded
         Then the following tabs should be open:
             - qute://help/settings.html#general-editor (active)
 
-    Scenario: :help with invalid setting (2 arrows)
-        When I run :help general->editor->foo
-        Then the error "Invalid help topic general->editor->foo!" should be shown
-
-    Scenario: :help with invalid setting (unknown section)
-        When I run :help foo->bar
-        Then the error "Invalid section foo!" should be shown
-
-    Scenario: :help with invalid setting (unknown option)
-        When I run :help general->bar
-        Then the error "Invalid option bar!" should be shown
+    Scenario: :help with invalid setting
+        When I run :help foo.bar
+        Then the error "Invalid option foo.bar!" should be shown
 
     Scenario: :help with -t
         When I open about:blank
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index 8bbed6561..64d524f7c 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -119,7 +119,7 @@ Feature: Tab management
     Scenario: :tab-close with select-on-remove = last-used and --opposite
         When I set tabs.select_on_remove to last-used
         And I run :tab-close --opposite
-        Then the error "-o is not supported with 'tabs->select-on-remove' set to 'last-used'!" should be shown
+        Then the error "-o is not supported with 'tabs.select_on_remove' set to 'last-used'!" should be shown
 
     Scenario: :tab-close should restore selection behavior
         When I set tabs.select_on_remove to next
@@ -835,7 +835,7 @@ Feature: Tab management
 
     # tab settings
 
-    Scenario: opening links with tabs->background-tabs true
+    Scenario: opening links with tabs.background true
         When I set tabs.background_tabs to true
         And I open data/hints/html/simple.html
         And I hint with args "all tab" and follow a
@@ -844,7 +844,7 @@ Feature: Tab management
             - data/hints/html/simple.html (active)
             - data/hello.txt
 
-    Scenario: opening tab with tabs->new-tab-position prev
+    Scenario: opening tab with tabs.new_tab_position prev
         When I set tabs.new_tab_position to prev
         And I set tabs.background_tabs to false
         And I open about:blank
@@ -856,7 +856,7 @@ Feature: Tab management
             - data/hello.txt (active)
             - data/hints/html/simple.html
 
-    Scenario: opening tab with tabs->new-tab-position next
+    Scenario: opening tab with tabs.new_tab_position next
         When I set tabs.new_tab_position to next
         And I set tabs.background_tabs to false
         And I open about:blank
@@ -868,7 +868,7 @@ Feature: Tab management
             - data/hints/html/simple.html
             - data/hello.txt (active)
 
-    Scenario: opening tab with tabs->new-tab-position first
+    Scenario: opening tab with tabs.new_tab_position first
         When I set tabs.new_tab_position to first
         And I set tabs.background_tabs to false
         And I open about:blank
@@ -880,7 +880,7 @@ Feature: Tab management
             - about:blank
             - data/hints/html/simple.html
 
-    Scenario: opening tab with tabs->new-tab-position last
+    Scenario: opening tab with tabs.new_tab_position last
         When I set tabs.new_tab_position to last
         And I set tabs.background_tabs to false
         And I open data/hints/html/simple.html
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index ef5b35885..00e959f4d 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -27,7 +27,7 @@ bdd.scenarios('editor.feature')
 @bdd.when(bdd.parsers.parse('I set up a fake editor replacing "{text}" by '
                             '"{replacement}"'))
 def set_up_editor_replacement(quteproc, httpbin, tmpdir, text, replacement):
-    """Set up general->editor to a small python script doing a replacement."""
+    """Set up editor.command to a small python script doing a replacement."""
     text = text.replace('(port)', str(httpbin.port))
     script = tmpdir / 'script.py'
     script.write(textwrap.dedent("""
@@ -47,7 +47,7 @@ def set_up_editor_replacement(quteproc, httpbin, tmpdir, text, replacement):
 
 @bdd.when(bdd.parsers.parse('I set up a fake editor returning "{text}"'))
 def set_up_editor(quteproc, httpbin, tmpdir, text):
-    """Set up general->editor to a small python script inserting a text."""
+    """Set up editor.command to a small python script inserting a text."""
     script = tmpdir / 'script.py'
     script.write(textwrap.dedent("""
         import sys