[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2007-06-11 14:01:37
Message-ID: 1181570497.510129.24456.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 673961 by hausmann:

Moved the code to populate KIO::MetaData from the QWebNetworkJob into a separate method.


 M  +20 -14    kwebnetworkinterface.cpp  
 M  +4 -0      kwebnetworkinterface.h  


--- trunk/playground/libs/webkitkde/kwebnetworkinterface.cpp #673960:673961
@@ -41,21 +41,8 @@
     else
         kioJob = KIO::http_post(job->url(), postData);
 
-    kioJob->addMetaData("PropagateHttpHeader", "true");
+    kioJob->addMetaData(metaDataForRequest(job->request()));
 
-    QHttpRequestHeader request = job->request();
-
-    kioJob->addMetaData("UserAgent", request.value("User-Agent"));
-    request.removeValue("User-Agent");
-
-    kioJob->addMetaData("accept", request.value("Accept"));
-    request.removeValue("Accept");
-
-    request.removeValue("content-length");
-    request.removeValue("Connection");
-
-    kioJob->addMetaData("customHTTPHeader", request.toString());
-
     kioJob->setProperty("qwebnetworkjob", QVariant::fromValue(job));
     m_jobs.insert(job, kioJob);
 
@@ -72,6 +59,25 @@
         kjob->kill();
 }
 
+KIO::MetaData KWebNetworkInterface::metaDataForRequest(QHttpRequestHeader request)
+{
+    KIO::MetaData metaData;
+
+    metaData.insert("PropagateHttpHeader", "true");
+
+    metaData.insert("UserAgent", request.value("User-Agent"));
+    request.removeValue("User-Agent");
+
+    metaData.insert("accept", request.value("Accept"));
+    request.removeValue("Accept");
+
+    request.removeValue("content-length");
+    request.removeValue("Connection");
+
+    metaData.insert("customHTTPHeader", request.toString());
+    return metaData;
+}
+
 void KWebNetworkInterface::forwardJobData(KIO::Job *kioJob, const QByteArray &data)
 {
     QWebNetworkJob *job = kioJob->property("qwebnetworkjob").value<QWebNetworkJob *>();
--- trunk/playground/libs/webkitkde/kwebnetworkinterface.h #673960:673961
@@ -25,6 +25,8 @@
 #include <qwebnetworkinterface.h>
 #include <qhash.h>
 
+#include <KIO/MetaData>
+
 namespace KIO
 {
     class Job;
@@ -40,6 +42,8 @@
     virtual void addJob(QWebNetworkJob *job);
     virtual void cancelJob(QWebNetworkJob *job);
 
+    static KIO::MetaData metaDataForRequest(QHttpRequestHeader request);
+
 private slots:
     void forwardJobData(KIO::Job *kioJob, const QByteArray &data);
     void forwardJobResult(KJob *kjob);
[prev in list] [next in list] [prev in thread] [next in thread]