[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b6d3a27be84b919812f8056b5e7c29a1a258df7e
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 14:31:04 2010 +0000

    2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fix WKStringQt.h and WKURLQt.h API problems.
            https://bugs.webkit.org/show_bug.cgi?id=47412
    
            * UIProcess/API/cpp/qt/WKStringQt.h:
            Remove the extern "C"
            * UIProcess/API/cpp/qt/WKURLQt.h:
            Remove the extern "C"
            * UIProcess/API/qt/qgraphicswkview.h:
            Fix the forwarded declaration
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bcd0a26..c400217 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,19 @@
 2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix WKStringQt.h and WKURLQt.h API problems.
+        https://bugs.webkit.org/show_bug.cgi?id=47412
+
+        * UIProcess/API/cpp/qt/WKStringQt.h:
+        Remove the extern "C"
+        * UIProcess/API/cpp/qt/WKURLQt.h:
+        Remove the extern "C"
+        * UIProcess/API/qt/qgraphicswkview.h:
+        Fix the forwarded declaration
+
+2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
         Reviewed by Kenneth Rohde Christiansen.
 
         [Qt] Don't use -whole-archive to link-in libWebKit2.a except for libQtWebKit.so
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
index 0397cb4..cc46e42 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
+++ b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
@@ -24,15 +24,7 @@
 #include <QString>
 #include <WebKit2/WKBase.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 WK_EXPORT WKStringRef WKStringCreateWithQString(const QString& string);
 WK_EXPORT QString WKStringCopyQString(WKStringRef string);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* WKStringQt_h */
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h
index 286fc98..2e41473 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h
+++ b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h
@@ -25,15 +25,7 @@
 #include <WebKit2/WKBase.h>
 #include <WebKit2/WKURL.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 WK_EXPORT WKURLRef WKURLCreateWithQUrl(const QUrl& url);
 QUrl WKURLCopyQUrl(WKURLRef url);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* WKURLCF_h */
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.h b/WebKit2/UIProcess/API/qt/qgraphicswkview.h
index 64ceaa5..c5e43b2 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.h
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.h
@@ -13,7 +13,7 @@ QT_END_NAMESPACE
 
 class QGraphicsWKViewPrivate;
 
-WKStringRef WKStringCreateWithQString(QString qString);
+WKStringRef WKStringCreateWithQString(const QString& qString);
 QString WKStringCopyQString(WKStringRef stringRef);
 
 class QWEBKIT_EXPORT QGraphicsWKView : public QGraphicsWidget {

-- 
WebKit Debian packaging