2010-07-30 Balazs Kelemen <kb@inf.u-szeged.hu>
authorabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Jul 2010 13:47:46 +0000 (13:47 +0000)
committerabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Jul 2010 13:47:46 +0000 (13:47 +0000)
        Unreviewed build fix.

        [Qt] Build fix for recent API changes in WebKit2.

        * UIProcess/API/cpp/qt/WKStringQt.cpp:
        (WKStringCopyQString):
        * UIProcess/API/cpp/qt/WKURLQt.cpp:
        (WKURLCopyQUrl):
        * UIProcess/API/qt/qwkpage.cpp:
        (QWKPage::QWKPage):

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

WebKit2/ChangeLog
WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
WebKit2/UIProcess/API/qt/qwkpage.cpp

index 0745e3e..f0309cb 100644 (file)
@@ -1,3 +1,16 @@
+2010-07-30  Balazs Kelemen  <kb@inf.u-szeged.hu>
+
+        Unreviewed build fix.
+
+        [Qt] Build fix for recent API changes in WebKit2.
+
+        * UIProcess/API/cpp/qt/WKStringQt.cpp:
+        (WKStringCopyQString):
+        * UIProcess/API/cpp/qt/WKURLQt.cpp:
+        (WKURLCopyQUrl):
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::QWKPage):
+
 2010-07-29  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Sam Weinig.
index 16f005a..2052f1e 100644 (file)
@@ -36,5 +36,6 @@ QString WKStringCopyQString(WKStringRef stringRef)
 {
     if (!stringRef)
         return QString();
-    return QString(reinterpret_cast<const QChar*>(toWK(stringRef)->characters()), toWK(stringRef)->length());
+    const WebCore::String& string = toWK(stringRef)->string();
+    return QString(reinterpret_cast<const QChar*>(string.characters()), string.length());
 }
index 8fbea29..22fe5d6 100644 (file)
@@ -36,5 +36,6 @@ QUrl WKURLCopyQUrl(WKURLRef urlRef)
 {
     if (!urlRef)
         return QUrl();
-    return QUrl(QString(reinterpret_cast<const QChar*>(toWK(urlRef)->characters()), toWK(urlRef)->length()));
+    const WebCore::String& string = toWK(urlRef)->string();
+    return QUrl(QString(reinterpret_cast<const QChar*>(string.characters()), string.length()));
 }
index 5c3c6d5..d17a3c2 100644 (file)
@@ -235,7 +235,9 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
         qt_wk_didChangeProgress,
         qt_wk_didFinishProgress,
         qt_wk_didBecomeUnresponsive,
-        qt_wk_didBecomeResponsive
+        qt_wk_didBecomeResponsive,
+        0,  /* processDidExit */
+        0   /* didChangeBackForwardList */
     };
     WKPageSetPageLoaderClient(pageRef(), &loadClient);
 
@@ -246,6 +248,8 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
         qt_wk_showPage,
         qt_wk_close,
         qt_wk_runJavaScriptAlert,
+        0,  /* runJavaScriptConfirm */
+        0   /* runJavaScriptPrompt */
     };
     WKPageSetPageUIClient(pageRef(), &uiClient);
 }