diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 748d6dc1..2cd40ea6 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -35,9 +35,10 @@ #include #include +#include "config.h" +#include "cookiejar.h" #include "networkaccessmanager.h" #include "networkreplyproxy.h" -#include "cookiejar.h" static const char *toString(QNetworkAccessManager::Operation op) { @@ -66,23 +67,23 @@ static const char *toString(QNetworkAccessManager::Operation op) } // public: -NetworkAccessManager::NetworkAccessManager(QObject *parent, bool diskCacheEnabled, QString cookieFile, bool ignoreSslErrors, QString authUser, QString authPass, int maxCacheSize) +NetworkAccessManager::NetworkAccessManager(QObject *parent, const Config *config) : QNetworkAccessManager(parent) - , m_ignoreSslErrors(ignoreSslErrors) - , m_authUser(authUser) - , m_authPass(authPass) + , m_ignoreSslErrors(config->ignoreSslErrors()) + , m_authUser(config->authUser()) + , m_authPass(config->authPass()) , m_idCounter(0) , m_networkDiskCache(0) { - if (!cookieFile.isEmpty()) { - setCookieJar(new CookieJar(cookieFile)); + if (!config->cookieFile().isEmpty()) { + setCookieJar(new CookieJar(config->cookieFile())); } - if (diskCacheEnabled) { + if (config->diskCacheEnabled()) { m_networkDiskCache = new QNetworkDiskCache(this); m_networkDiskCache->setCacheDirectory(QDesktopServices::storageLocation(QDesktopServices::CacheLocation)); - if (maxCacheSize >= 0) - m_networkDiskCache->setMaximumCacheSize(maxCacheSize * 1024); + if (config->maxDiskCacheSize() >= 0) + m_networkDiskCache->setMaximumCacheSize(config->maxDiskCacheSize() * 1024); setCache(m_networkDiskCache); } diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index 84ef4863..c122f2a2 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -37,16 +37,14 @@ #include #include +class Config; class QNetworkDiskCache; class NetworkAccessManager : public QNetworkAccessManager { Q_OBJECT public: - NetworkAccessManager(QObject *parent = 0, bool diskCacheEnabled = false, - QString cookieFile = QString(), bool ignoreSslErrors = false, - QString authUser = QString(), QString authPass = QString(), - int maxCacheSize = -1); + NetworkAccessManager(QObject *parent, const Config *config); protected: bool m_ignoreSslErrors; diff --git a/src/phantom.cpp b/src/phantom.cpp index 584be2d6..9880b194 100644 --- a/src/phantom.cpp +++ b/src/phantom.cpp @@ -92,8 +92,7 @@ Phantom::Phantom(QObject *parent) m_scriptFileEnc.setEncoding(m_config.scriptEncoding()); // Provide WebPage with a non-standard Network Access Manager - m_netAccessMan = new NetworkAccessManager(this, m_config.diskCacheEnabled(), - m_config.cookieFile(), m_config.ignoreSslErrors(), m_config.authUser(), m_config.authPass(), m_config.maxDiskCacheSize()); + m_netAccessMan = new NetworkAccessManager(this, &m_config); m_page->setNetworkAccessManager(m_netAccessMan); connect(m_page, SIGNAL(javaScriptConsoleMessageSent(QString, int, QString)),