2009-03-12 Xan Lopez <xlopez@igalia.com>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=24544
        Rename setUrl to setURL

        Use proper case for setUrl method, rename it to setURL.

        * platform/network/ResourceResponseBase.cpp:
        (WebCore::ResourceResponseBase::adopt):
        * platform/network/ResourceResponseBase.h:
        * platform/network/curl/ResourceHandleManager.cpp:
        (WebCore::writeCallback):
        (WebCore::headerCallback):
        * platform/network/soup/ResourceHandleSoup.cpp:
        (WebCore::fillResponseFromMessage):
        (WebCore::queryInfoCallback):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8c166433e33502de8e275fcfacbd281fab472f02..016864c32447000800afac0a51d88a054c574334 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-03-12  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24544
+        Rename setUrl to setURL
+
+        Use proper case for setUrl method, rename it to setURL.
+
+        * platform/network/ResourceResponseBase.cpp:
+        (WebCore::ResourceResponseBase::adopt):
+        * platform/network/ResourceResponseBase.h:
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::writeCallback):
+        (WebCore::headerCallback):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::fillResponseFromMessage):
+        (WebCore::queryInfoCallback):
+
 2009-03-12  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Alexey Proskuryakov.

diff --git a/WebCore/platform/network/ResourceResponseBase.cpp b/WebCore/platform/network/ResourceResponseBase.cpp
index f84e97d42ee654391c386b6e800fbd5895f0aa7c..afd8d1eb70b2ff2d71ac029e30fa7a3c21f744f8 100644 (file)
--- a/WebCore/platform/network/ResourceResponseBase.cpp
+++ b/WebCore/platform/network/ResourceResponseBase.cpp
@@ -39,7 +39,7 @@ static void parseCacheControlDirectiveValues(const String& directives, Vector<St
 auto_ptr<ResourceResponse> ResourceResponseBase::adopt(auto_ptr<CrossThreadResourceResponseData> data)
 {
     auto_ptr<ResourceResponse> response(new ResourceResponse());
-    response->setUrl(data->m_url);
+    response->setURL(data->m_url);
     response->setMimeType(data->m_mimeType);
     response->setExpectedContentLength(data->m_expectedContentLength);
     response->setTextEncodingName(data->m_textEncodingName);
@@ -94,7 +94,7 @@ const KURL& ResourceResponseBase::url() const
     return m_url; 
 }
 
-void ResourceResponseBase::setUrl(const KURL& url)
+void ResourceResponseBase::setURL(const KURL& url)
 {
     lazyInit();
     m_isNull = false;

diff --git a/WebCore/platform/network/ResourceResponseBase.h b/WebCore/platform/network/ResourceResponseBase.h
index 6969dea38085c68a28588761b0aff2d79e242c9a..58d4d562003b26fb58223cf2d18bd0c75eb08d0b 100644 (file)
--- a/WebCore/platform/network/ResourceResponseBase.h
+++ b/WebCore/platform/network/ResourceResponseBase.h
@@ -49,7 +49,7 @@ public:
     bool isHTTP() const;
 
     const KURL& url() const;
-    void setUrl(const KURL& url);
+    void setURL(const KURL& url);
 
     const String& mimeType() const;
     void setMimeType(const String& mimeType);

diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp
index 6a44233e65f2d316aae496ca1e78e5e5884d6ac8..6f009db8ebb01d7069f02005b8d20a3cc5d592ca 100644 (file)
--- a/WebCore/platform/network/curl/ResourceHandleManager.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp
@@ -126,7 +126,7 @@ static size_t writeCallback(void* ptr, size_t size, size_t nmemb, void* data)
     if (!d->m_response.responseFired()) {
         const char* hdr;
         err = curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &hdr);
-        d->m_response.setUrl(KURL(hdr));
+        d->m_response.setURL(KURL(hdr));
         if (d->client())
             d->client()->didReceiveResponse(job, d->m_response);
         d->m_response.setResponseFired(true);
@@ -180,7 +180,7 @@ static size_t headerCallback(char* ptr, size_t size, size_t nmemb, void* data)
 
         const char* hdr;
         err = curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &hdr);
-        d->m_response.setUrl(KURL(hdr));
+        d->m_response.setURL(KURL(hdr));
 
         long httpCode = 0;
         err = curl_easy_getinfo(h, CURLINFO_RESPONSE_CODE, &httpCode);

diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index c87ec5d31c8a03366814be59a7f65d1c40d10556..34b2d7f2e631433d6b2913b037ff59b1da462b02 100644 (file)
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -161,7 +161,7 @@ static void fillResponseFromMessage(SoupMessage* msg, ResourceResponse* response
 
     String contentType = soup_message_headers_get(msg->response_headers, "Content-Type");
     char* uri = soup_uri_to_string(soup_message_get_uri(msg), false);
-    response->setUrl(KURL(KURL(), uri));
+    response->setURL(KURL(KURL(), uri));
     g_free(uri);
     response->setMimeType(extractMIMETypeFromMediaType(contentType));
     response->setTextEncodingName(extractCharsetFromMediaType(contentType));
@@ -734,7 +734,7 @@ static void queryInfoCallback(GObject* source, GAsyncResult* res, gpointer)
     ResourceResponse response;
 
     char* uri = g_file_get_uri(d->m_gfile);
-    response.setUrl(KURL(KURL(), uri));
+    response.setURL(KURL(KURL(), uri));
     g_free(uri);
 
     GError *error = 0;