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

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Laurent Montel <montel () kde ! org>
Date:       2007-08-16 7:24:27
Message-ID: 1187249067.672793.15580.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 700699 by mlaurent:

KParts::URLArgs--


 M  +14 -13    webkitpart.cpp  


--- trunk/playground/libs/webkitkde/webkitpart.cpp #700698:700699
@@ -58,17 +58,17 @@
 {
     setUrl(url);
 
-    KParts::URLArgs args = browserExtension->urlArgs();
-
-    QString headerString = args.doPost() ? "POST" : "GET";
+    KParts::OpenUrlArguments arguments;
+    KParts::BrowserArguments browserArguments = \
browserExtension->browserArguments(); +    QString headerString = \
browserArguments.doPost() ? "POST" : "GET";  headerString += QLatin1Char(' ');
     headerString += url.toEncoded(QUrl::RemoveScheme|QUrl::RemoveAuthority);
     headerString += QLatin1String(" HTTP/1.1\n\n"); // ### does it matter?
-    headerString += args.metaData().value("customHTTPHeader");
+    headerString += arguments.metaData().value("customHTTPHeader");
     QHttpRequestHeader header(headerString);
 
-    QWebNetworkRequest request(url, args.doPost() ? QWebNetworkRequest::Post : \
                QWebNetworkRequest::Get,
-                               args.postData);
+    QWebNetworkRequest request(url, browserArguments.doPost() ? \
QWebNetworkRequest::Post : QWebNetworkRequest::Get, +                               \
browserArguments.postData);  
     foreach (QString key, header.keys())
         request.setHttpHeaderField(key, header.value(key));
@@ -104,14 +104,15 @@
 
 QWebPage::NavigationRequestResponse WebKitPart::navigationRequested(const \
QWebNetworkRequest &request)  {
-    KParts::URLArgs args;
-    args.postData = request.postData();
-    if (!args.postData.isEmpty())
-        args.setDoPost(true);
+    KParts::OpenUrlArguments arguments;
+    KParts::BrowserArguments browserArguments;
+    browserArguments.postData = request.postData();
+    if (!browserArguments.postData.isEmpty())
+        browserArguments.setDoPost(true);
 
-    args.metaData().unite(KWebNetworkInterface::metaDataForRequest(request.httpHeader()));
 +    arguments.metaData().unite(KWebNetworkInterface::metaDataForRequest(request.httpHeader()));
  
-    emit browserExtension->openUrlRequest(request.url(), args);
+    emit browserExtension->openUrlRequest(request.url(), arguments, \
browserArguments);  
     return QWebPage::IgnoreNavigationRequest;
 }
@@ -143,7 +144,7 @@
     flags |= KParts::BrowserExtension::ShowBookmark;
     flags |= KParts::BrowserExtension::ShowNavigationItems;
     emit part->browserExt()->popupMenu(/*guiclient */0,
-                                       e->globalPos(), part->url(), \
KParts::URLArgs(), +                                       e->globalPos(), \
part->url(), KParts::OpenUrlArguments(), KParts::BrowserArguments(),  flags);
 }
 


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