qPref: use helper function to ensure key/name grouping

We had a couple of instances of names being incorrectly merged with their
group, this should handle that better. It's a bit of a big hammer to use, but
it seems to work (and it makes it easy to then git grep for cases that don't
use the new helper function.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-07 09:06:00 -07:00
parent db57a633d5
commit 2ecbea3d24
15 changed files with 157 additions and 149 deletions

View file

@ -25,14 +25,14 @@ void qPrefProxy::loadSync(bool doSync)
disk_proxy_user(doSync);
}
HANDLE_PREFERENCE_BOOL(Proxy, "/proxy_auth", proxy_auth);
HANDLE_PREFERENCE_BOOL(Proxy, "proxy_auth", proxy_auth);
HANDLE_PREFERENCE_TXT(Proxy, "/proxy_host", proxy_host);
HANDLE_PREFERENCE_TXT(Proxy, "proxy_host", proxy_host);
HANDLE_PREFERENCE_TXT(Proxy, "/proxy_pass", proxy_pass);
HANDLE_PREFERENCE_TXT(Proxy, "proxy_pass", proxy_pass);
HANDLE_PREFERENCE_INT(Proxy, "/proxy_port", proxy_port);
HANDLE_PREFERENCE_INT(Proxy, "proxy_port", proxy_port);
HANDLE_PREFERENCE_INT_DEF(Proxy, "/proxy_type", proxy_type, QNetworkProxy::DefaultProxy);
HANDLE_PREFERENCE_INT_DEF(Proxy, "proxy_type", proxy_type, QNetworkProxy::DefaultProxy);
HANDLE_PREFERENCE_TXT(Proxy, "/proxy_user", proxy_user);
HANDLE_PREFERENCE_TXT(Proxy, "proxy_user", proxy_user);