Build fix for Qt, Gtk, and Wx.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 07:44:02 +0000 (07:44 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 07:44:02 +0000 (07:44 +0000)
        * platform/gtk/CookieJarGtk.cpp:
        (WebCore::setCookies):
        (WebCore::cookies):
        * platform/qt/ClipboardQt.cpp:
        (WebCore::ClipboardQt::writeURL):
        * platform/qt/CookieJarQt.cpp:
        (WebCore::setCookies):
        (WebCore::cookies):
        * platform/wx/PasteboardWx.cpp:
        (WebCore::Pasteboard::writeURL):

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

WebCore/ChangeLog
WebCore/platform/gtk/CookieJarGtk.cpp
WebCore/platform/qt/ClipboardQt.cpp
WebCore/platform/qt/CookieJarQt.cpp
WebCore/platform/wx/PasteboardWx.cpp

index 388f2ab35120f29a9679b5ca8f1891eb000a921e..b43fe08f071ffe7805a7c773a5b00bc8162ac96b 100644 (file)
@@ -1,3 +1,18 @@
+2007-12-11  Sam Weinig  <sam@webkit.org>
+
+        Build fix for Qt, Gtk, and Wx.
+
+        * platform/gtk/CookieJarGtk.cpp:
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        * platform/qt/ClipboardQt.cpp:
+        (WebCore::ClipboardQt::writeURL):
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        * platform/wx/PasteboardWx.cpp:
+        (WebCore::Pasteboard::writeURL):
+
 2007-12-11  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Darin Adler.
index 67015077e6ff26ac244987aa902e47df9ec7b492..a2a24d16228c12398d9fb6f9e0ab19869f503ba0 100644 (file)
@@ -40,12 +40,12 @@ static HashMap<String, String> cookieJar;
 
 void setCookies(const KURL& url, const KURL& /*policyURL*/, const String& value)
 {
-    cookieJar.set(url.url(), value);
+    cookieJar.set(url.string(), value);
 }
 
 String cookies(const KURL& url)
 {
-    return cookieJar.get(url.url());
+    return cookieJar.get(url.string());
 }
 
 bool cookiesEnabled()
index 3f63b33875cda5428643d9cdb572a4cb04eb04eb..f7c420f1a285cd2f4af99a4af04f1a79a55acbd7 100644 (file)
@@ -258,7 +258,7 @@ void ClipboardQt::writeURL(const KURL& url, const String&, Frame* frame)
     ASSERT(frame);
     
     QList<QUrl> urls;
-    urls.append(QUrl(frame->document()->completeURL(url.url())));
+    urls.append(QUrl(frame->document()->completeURL(url.deprecatedString())));
     if (!m_writableData)
         m_writableData = new QMimeData;
     m_writableData->setUrls(urls);
index 6344304c8bf66a83a5eb0f1308b0bf397e407144..7c980fe538bdd5dd7b4f12e0cf9b93820e6b1514 100644 (file)
@@ -38,14 +38,14 @@ namespace WebCore {
 
 void setCookies(const KURL& url, const KURL& policyURL, const String& value)
 {
-    QUrl u((QString)url.url());
-    QUrl p((QString)policyURL.url());
+    QUrl u((QString)url.string());
+    QUrl p((QString)policyURL.string());
     QCookieJar::cookieJar()->setCookies(u, p, (QString)value);
 }
 
 String cookies(const KURL& url)
 {
-    QUrl u((QString)url.url());
+    QUrl u((QString)url.string());
     QString cookies = QCookieJar::cookieJar()->cookies(u);
     int idx = cookies.indexOf(QLatin1Char(';'));
     if (idx > 0)
index 5f90c51cb6690c6863a0bcd38038f3ac92bac920..023e661a4f2f082539e72beaf31146168c28dfcb 100644 (file)
@@ -80,7 +80,7 @@ void Pasteboard::writeURL(const KURL& url, const String&, Frame*)
 {
     if (wxTheClipboard->Open())
     {
-        wxTheClipboard->SetData( new wxTextDataObject( url.url() ) );
+        wxTheClipboard->SetData( new wxTextDataObject( url.string() ) );
         wxTheClipboard->Close();
     }
 }