From kde-commits Wed Jan 26 13:38:07 2011 From: Dawit Alemayehu Date: Wed, 26 Jan 2011 13:38:07 +0000 To: kde-commits Subject: KDE/kdelibs/kio/kio Message-Id: <20110126133807.E5D96AC8BA () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129604912112135 SVN commit 1217269 by adawit: Cosmetic change... M +20 -12 accessmanager.cpp --- trunk/KDE/kdelibs/kio/kio/accessmanager.cpp #1217268:1217269 @@ -256,9 +256,8 @@ { // Add any meta data specified within request... QVariant userMetaData = request.attribute (static_cast(MetaData)); - if (userMetaData.isValid() && userMetaData.type() == QVariant::Map) { + if (userMetaData.isValid() && userMetaData.type() == QVariant::Map) metaData += userMetaData.toMap(); - } metaData.insert("PropagateHttpHeader", "true"); @@ -282,7 +281,7 @@ request.setRawHeader("Content-Type", QByteArray()); } - request.setRawHeader("content-length", QByteArray()); + request.setRawHeader("Content-Length", QByteArray()); request.setRawHeader("Connection", QByteArray()); request.setRawHeader("If-None-Match", QByteArray()); request.setRawHeader("If-Modified-Since", QByteArray()); @@ -345,23 +344,28 @@ } CookieJar::CookieJar(QObject* parent) - :QNetworkCookieJar(parent), d(new CookieJar::CookieJarPrivate) { + :QNetworkCookieJar(parent), d(new CookieJar::CookieJarPrivate) +{ reparseConfiguration(); } -CookieJar::~CookieJar() { +CookieJar::~CookieJar() +{ delete d; } -WId CookieJar::windowId() const { +WId CookieJar::windowId() const +{ return d->windowId; } -bool CookieJar::isCookieStorageDisabled() const { +bool CookieJar::isCookieStorageDisabled() const +{ return d->isStorageDisabled; } -QList CookieJar::cookiesForUrl(const QUrl &url) const { +QList CookieJar::cookiesForUrl(const QUrl &url) const +{ QList cookieList; if (d->isEnabled) { @@ -387,7 +391,8 @@ return cookieList; } -bool CookieJar::setCookiesFromUrl(const QList &cookieList, const QUrl &url) { +bool CookieJar::setCookiesFromUrl(const QList &cookieList, const QUrl &url) +{ if (d->isEnabled) { QDBusInterface kcookiejar("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer"); Q_FOREACH(const QNetworkCookie &cookie, cookieList) { @@ -408,15 +413,18 @@ return false; } -void CookieJar::setDisableCookieStorage(bool disable) { +void CookieJar::setDisableCookieStorage(bool disable) +{ d->isStorageDisabled = disable; } -void CookieJar::setWindowId(WId id) { +void CookieJar::setWindowId(WId id) +{ d->windowId = id; } -void CookieJar::reparseConfiguration() { +void CookieJar::reparseConfiguration() +{ KConfigGroup cfg = KSharedConfig::openConfig("kcookiejarrc", KConfig::NoGlobals)->group("Cookie Policy"); d->isEnabled = cfg.readEntry("Cookies", true); }