some warnings fixed, TDESKTOP_DISABLE_NETWORK_PROXY macro added

This commit is contained in:
John Preston
2016-03-20 11:16:35 +03:00
parent 2cbda4e1e5
commit 0b2bcbc3e9
25 changed files with 143 additions and 105 deletions
@@ -771,9 +771,11 @@ private:
};
void reinitWebLoadManager() {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
if (webLoadManager()) {
webLoadManager()->setProxySettings(App::getHttpProxySettings());
}
#endif
}
void stopWebLoadManager() {
@@ -790,11 +792,13 @@ void stopWebLoadManager() {
}
}
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
void WebLoadManager::setProxySettings(const QNetworkProxy &proxy) {
QMutexLocker lock(&_loaderPointersMutex);
_proxySettings = proxy;
emit proxyApplyDelayed();
}
#endif
WebLoadManager::WebLoadManager(QThread *thread) {
moveToThread(thread);
@@ -1021,8 +1025,10 @@ void WebLoadManager::sendRequest(webFileLoaderPrivate *loader, const QString &re
}
void WebLoadManager::proxyApply() {
#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
QMutexLocker lock(&_loaderPointersMutex);
_manager.setProxy(_proxySettings);
#endif
}
void WebLoadManager::finish() {