Changeset 81967 in webkit

Timestamp:

Mar 25, 2011 10:21:41 AM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

[Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
​https://bugs.webkit.org/show_bug.cgi?id=57087

Reviewed by Andreas Kling.

Use explicit conversion for string to avoid depending on the default codec
installed by the user code.

• bridge/qt/qt_pixmapruntime.cpp:

(JSC::Bindings::QtPixmapToDataUrlMethod::invoke):
(JSC::Bindings::QtPixmapInstance::valueOf):

• platform/qt/LanguageQt.cpp:

(WebCore::platformDefaultLanguage):

• platform/qt/PasteboardQt.cpp:

(WebCore::Pasteboard::writeSelection):

• plugins/qt/PluginPackageQt.cpp:

(WebCore::initializeGtk):

• plugins/qt/PluginViewQt.cpp:

(WebCore::getPluginDisplay):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/qt/qt_pixmapruntime.cpp (modified) (2 diffs)
• platform/qt/LanguageQt.cpp (modified) (1 diff)
• platform/qt/PasteboardQt.cpp (modified) (1 diff)
• plugins/qt/PluginPackageQt.cpp (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-25  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
+        https://bugs.webkit.org/show_bug.cgi?id=57087
+
+        Use explicit conversion for string to avoid depending on the default codec
+        installed by the user code.
+
+        * bridge/qt/qt_pixmapruntime.cpp:
+        (JSC::Bindings::QtPixmapToDataUrlMethod::invoke):
+        (JSC::Bindings::QtPixmapInstance::valueOf):
+        * platform/qt/LanguageQt.cpp:
+        (WebCore::platformDefaultLanguage):
+        * platform/qt/PasteboardQt.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        * plugins/qt/PluginPackageQt.cpp:
+        (WebCore::initializeGtk):
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::getPluginDisplay):
+
 2011-03-25  Chang Shu  <cshu@webkit.org>
 

trunk/Source/WebCore/bridge/qt/qt_pixmapruntime.cpp

@@ -120 +120 @@
         QBuffer buffer(&byteArray);
         instance->toImage().save(&buffer, "PNG");
-        const QString encodedString = QString("data:image/png;base64,") + byteArray.toBase64();
+        const QString encodedString = QLatin1String("data:image/png;base64,") + QLatin1String(byteArray.toBase64());
         const UString ustring((UChar*)encodedString.utf16(), encodedString.length());
         return jsString(exec, ustring);
@@ -240 +240 @@
 JSValue QtPixmapInstance::valueOf(ExecState* exec) const
 {
-    const QString stringValue = QString("[Qt Native Pixmap %1,%2]").arg(width()).arg(height());
+    const QString stringValue = QString::fromLatin1("[Qt Native Pixmap %1,%2]").arg(width()).arg(height());
     UString ustring((UChar*)stringValue.utf16(), stringValue.length());
     return jsString(exec, ustring);

trunk/Source/WebCore/platform/qt/LanguageQt.cpp

@@ -36 +36 @@
 {
     QLocale locale;
-    return locale.name().replace("_", "-");
+    return locale.name().replace(QLatin1Char('_'), QLatin1Char('-'));
 }
 

trunk/Source/WebCore/platform/qt/PasteboardQt.cpp

@@ -78 +78 @@
 #endif
     if (canSmartCopyOrDelete)
-        md->setData("application/vnd.qtwebkit.smartpaste", QByteArray());
+        md->setData(QLatin1String("application/vnd.qtwebkit.smartpaste"), QByteArray());
 }
 

trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp

@@ -122 +122 @@
     }
 
-    QLibrary library("libgtk-x11-2.0.so.0");
+    QLibrary library(QLatin1String("libgtk-x11-2.0.so.0"));
     if (library.load()) {
         typedef void *(*gtk_init_check_ptr)(int*, char***);

trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp

@@ -848 +848 @@
     // The code below has the same effect as this one:
     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-    QLibrary library("libgdk-x11-2.0", 0);
+    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
     if (!library.load())
         return 0;