Changed the QWebPage::open(const QUrl &url, const QHttpRequestHeader &httpHeader...
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2007 13:04:50 +0000 (13:04 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2007 13:04:50 +0000 (13:04 +0000)
overload to take a QWebNetworkRequest instead.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitQt/Api/qwebpage.cpp
WebKitQt/Api/qwebpage.h
WebKitQt/ChangeLog

index 78e8140326bd557f7e20c28f6824b19d0bd4cbe0..b100542ec6e49a90b4cc04bb2692c44eac135d1d 100644 (file)
@@ -131,12 +131,19 @@ QWebFrame *QWebPage::createFrame(QWebFrame *parentFrame, QWebFrameData *frameDat
 
 void QWebPage::open(const QUrl &url)
 {
-    open(url, QHttpRequestHeader(), QByteArray());
+    QWebNetworkRequest request;
+    request.setUrl(url);
+    open(request);
 }
 
-void QWebPage::open(const QUrl &url, const QHttpRequestHeader &httpHeader, const QByteArray &postData)
+void QWebPage::open(const QWebNetworkRequest &req)
 {
     d->insideOpenCall = true;
+
+    QUrl url = req.url();
+    QHttpRequestHeader httpHeader = req.httpHeader();
+    QByteArray postData = req.postData();
+
     WebCore::ResourceRequest request(KURL(url.toString()));
 
     QString method = httpHeader.method();
index 257f80c16d5102c574d589a637bc8aaa49a3e210..f47ae360a56a2d968d4154acf6a6db42340ace5e 100644 (file)
@@ -32,7 +32,6 @@
 class QWebFrame;
 class QUndoStack;
 class QUrl;
-class QHttpRequestHeader;
 class QWebNetworkRequest;
 
 class QWebPagePrivate;
@@ -63,7 +62,7 @@ public:
 
 
     void open(const QUrl &url);
-    void open(const QUrl &url, const QHttpRequestHeader &httpHeader, const QByteArray &postData);
+    void open(const QWebNetworkRequest &request);
 
     QWebFrame *mainFrame() const;
 
index a66f85616beebf44f74199835c2b841a329db530..7b6f0b04a72536494f84687c9eb85bffd1c4708b 100644 (file)
@@ -1,3 +1,14 @@
+2007-06-13  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Changed the QWebPage::open(const QUrl &url, const QHttpRequestHeader &httpHeader, const QByteArray &postData)
+        overload to take a QWebNetworkRequest instead.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::open):
+        * Api/qwebpage.h:
+
 2007-06-13  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.