Moved QWebNetworkJob::Method enum into QWebNetworkRequest.
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2007 13:03:57 +0000 (13:03 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2007 13:03:57 +0000 (13:03 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23492 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitQt/Api/qwebnetworkinterface.h
WebKitQt/Api/qwebobjectpluginconnector.cpp
WebKitQt/Api/qwebobjectpluginconnector.h
WebKitQt/ChangeLog

index 8eb2aa836ce90fc67790b1542a30b0c800d5f518..dc6e719aa27b853967bbb867d93475fa2bee2de2 100644 (file)
@@ -41,6 +41,12 @@ struct QWebNetworkRequestPrivate;
 class QWEBKIT_EXPORT QWebNetworkRequest
 {
 public:
+    enum Method {
+        Get,
+        Post
+        //Head
+    };
+
     QWebNetworkRequest();
     QWebNetworkRequest(const QWebNetworkRequest &other);
     QWebNetworkRequest &operator=(const QWebNetworkRequest &other);
@@ -64,11 +70,6 @@ private:
 class QWEBKIT_EXPORT QWebNetworkJob
 {
 public:
-    enum Method {
-        Get,
-        Post
-        //Head
-    };
     QUrl url() const;
     QByteArray postData() const;
     QHttpRequestHeader httpHeader() const;
index 8c5e276fa34a5526c3da2cd584587f10827c00c9..e779f14a2d86b5b56f30674fb7d42b7142ab383f 100644 (file)
@@ -46,7 +46,7 @@ QWidget *QWebObjectPluginConnector::pluginParentWidget() const
     return d->frame->viewport();
 }
 
-QWebNetworkJob *QWebObjectPluginConnector::requestUrl(QWebNetworkJob::Method method, const QUrl &url, Target target)
+QWebNetworkJob *QWebObjectPluginConnector::requestUrl(QWebNetworkRequest::Method method, const QUrl &url, Target target)
 {
     if (target != Plugin)
         return 0;
@@ -56,7 +56,7 @@ QWebNetworkJob *QWebObjectPluginConnector::requestUrl(QWebNetworkJob::Method met
     p->interface = d->frame->page()->networkInterface();
     p->connector = this;
 
-    QString m = (method == QWebNetworkJob::Get ? "GET" : "POST");
+    QString m = (method == QWebNetworkRequest::Get ? "GET" : "POST");
     p->request.init(m, url);
 
     d->frame->page()->networkInterface()->addJob(job);
index 734da1deef5d31cd16e25f6dd055b6a59592cd52..5ec48129a9a9899598704189d5f45b7f8c045f77 100644 (file)
@@ -48,7 +48,7 @@ public:
         Parent,
         Top
     };
-    QWebNetworkJob *requestUrl(QWebNetworkJob::Method, const QUrl &url, Target target = Plugin);
+    QWebNetworkJob *requestUrl(QWebNetworkRequest::Method, const QUrl &url, Target target = Plugin);
 
 signals:
     void started(QWebNetworkJob*);
index 2adf70cd386fe98842ff294ae1bcf255b2d91489..bcc9b3fa06b409c33fe2b92fcf569ffb515c9c06 100644 (file)
@@ -1,3 +1,14 @@
+2007-06-13  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Moved QWebNetworkJob::Method enum into QWebNetworkRequest.
+
+        * Api/qwebnetworkinterface.h:
+        * Api/qwebobjectpluginconnector.cpp:
+        (QWebObjectPluginConnector::requestUrl):
+        * Api/qwebobjectpluginconnector.h:
+
 2007-06-13  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.