Changeset 82059 in webkit

Timestamp:

Mar 27, 2011 12:18:55 AM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2011-03-27 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.

• Api/qwebkitversion.cpp: (qWebKitVersion):
• Api/qwebpage.cpp: (QWebPagePrivate::dynamicPropertyChangeEvent): (QWebPage::javaScriptConsoleMessage):
• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (convertToPropertyName): (DumpRenderTreeSupportQt::setEditingBehavior): (DumpRenderTreeSupportQt::plainText):
• WebCoreSupport/EditorClientQt.cpp: (dumpRange):
• WebCoreSupport/FrameLoaderClientQt.cpp: (drtDescriptionSuitableForTestResult): (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
• WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::openInspectorFrontend):
• WebCoreSupport/InspectorServerQt.cpp: (WebCore::parseWebSocketChallengeNumber): (WebCore::InspectorServerRequestHandlerQt::tcpReadyRead):

Location:

trunk/Source/WebKit/qt

Files:

• Api/qwebkitversion.cpp (modified) (1 diff)
• Api/qwebpage.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (3 diffs)
• WebCoreSupport/EditorClientQt.cpp (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientQt.cpp (modified) (4 diffs)
• WebCoreSupport/InspectorClientQt.cpp (modified) (2 diffs)
• WebCoreSupport/InspectorServerQt.cpp (modified) (6 diffs)

trunk/Source/WebKit/qt/Api/qwebkitversion.cpp

@@ -41 +41 @@
 QString qWebKitVersion()
 {
-    return QString("%1.%2").arg(WEBKIT_MAJOR_VERSION).arg(WEBKIT_MINOR_VERSION);
+    return QString::fromLatin1("%1.%2").arg(WEBKIT_MAJOR_VERSION).arg(WEBKIT_MINOR_VERSION);
 }
 

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -1169 +1169 @@
         QString p = q->property("_q_RepaintThrottlingPreset").toString();
         for(int i = 0; i < sizeof(presets) / sizeof(presets[0]); i++) {
-            if(p == presets[i].name) {
+            if (p == QLatin1String(presets[i].name)) {
                 FrameView::setRepaintThrottlingDeferredRepaintDelay(
                         presets[i].deferredRepaintDelay);
@@ -2074 +2074 @@
     // At this point DRT's WebPage has already been destroyed
     if (QWebPagePrivate::drtRun) {
-        if (message == "PLUGIN: NPP_Destroy")
+        if (message == QLatin1String("PLUGIN: NPP_Destroy"))
             fprintf (stdout, "CONSOLE MESSAGE: line %d: %s\n", lineNumber, message.toUtf8().constData());
     }

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-03-27  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.
+
+        * Api/qwebkitversion.cpp:
+        (qWebKitVersion):
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+        (QWebPage::javaScriptConsoleMessage):
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (convertToPropertyName):
+        (DumpRenderTreeSupportQt::setEditingBehavior):
+        (DumpRenderTreeSupportQt::plainText):
+        * WebCoreSupport/EditorClientQt.cpp:
+        (dumpRange):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (drtDescriptionSuitableForTestResult):
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+        * WebCoreSupport/InspectorServerQt.cpp:
+        (WebCore::parseWebSocketChallengeNumber):
+        (WebCore::InspectorServerRequestHandlerQt::tcpReadyRead):
+
 2011-03-26  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -532 +532 @@
 static QString convertToPropertyName(const QString& name)
 {
-    QStringList parts = name.split('-');
+    QStringList parts = name.split(QLatin1Char('-'));
     QString camelCaseName;
     for (int j = 0; j < parts.count(); ++j) {
@@ -627 +627 @@
     WebCore::EditingBehaviorType coreEditingBehavior;
 
-    if (editingBehavior == "win")
+    if (editingBehavior == QLatin1String("win"))
         coreEditingBehavior = EditingWindowsBehavior;
-    else if (editingBehavior == "mac")
+    else if (editingBehavior == QLatin1String("mac"))
         coreEditingBehavior = EditingMacBehavior;
-    else if (editingBehavior == "unix")
+    else if (editingBehavior == QLatin1String("unix"))
         coreEditingBehavior = EditingUnixBehavior;
     else {
@@ -924 +924 @@
 {
     QMap<QString, QVariant> map = range.toMap();
-    QVariant startContainer  = map.value("startContainer");
+    QVariant startContainer  = map.value(QLatin1String("startContainer"));
     map = startContainer.toMap();
 
-    return map.value("innerText").toString();
+    return map.value(QLatin1String("innerText")).toString();
 }
 

trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

@@ -77 +77 @@
     WebCore::ExceptionCode code;
 
-    QString str = QString("range from %1 of %2 to %3 of %4")
-        .arg(range->startOffset(code)).arg(dumpPath(range->startContainer(code)))
-        .arg(range->endOffset(code)).arg(dumpPath(range->endContainer(code)));
+    QString str = QString::fromLatin1("range from %1 of %2 to %3 of %4")
+            .arg(range->startOffset(code)).arg(dumpPath(range->startContainer(code)))
+            .arg(range->endOffset(code)).arg(dumpPath(range->endContainer(code)));
 
     return str;

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -123 +123 @@
         return _url.string();
     // Remove the leading path from file urls
-    return QString(_url.string()).replace(WebCore::FrameLoaderClientQt::dumpResourceLoadCallbacksPath, "").mid(1);
+    return QString(_url.string()).remove(WebCore::FrameLoaderClientQt::dumpResourceLoadCallbacksPath).mid(1);
 }
 
@@ -151 +151 @@
     QString result;
     if (exception) {
-        result.append("ERROR");
+        result.append(QLatin1String("ERROR"));
         return result;
     }
     if (!node) {
-        result.append("NULL");
+        result.append(QLatin1String("NULL"));
         return result;
     }
@@ -161 +161 @@
     RefPtr<WebCore::Node> parent = node->parentNode();
     if (parent) {
-        result.append(" > ");
+        result.append(QLatin1String(" > "));
         result.append(drtDescriptionSuitableForTestResult(parent, 0));
     }
@@ -1230 +1230 @@
         printf("Policy delegate: attempt to load %s with navigation type '%s'%s\n",
                qPrintable(drtDescriptionSuitableForTestResult(request.url())), navigationTypeToString(action.type()),
-               (node) ? qPrintable(QString(" originating from " + drtDescriptionSuitableForTestResult(node, 0))) : "");
+               (node) ? qPrintable(QString::fromLatin1(" originating from ") + drtDescriptionSuitableForTestResult(node, 0)) : "");
 
         if (policyDelegatePermissive)

trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp

@@ -141 +141 @@
         QString settingKey(settingStoragePrefix + QString(name));
         qsettings.setValue(settingKey, valueToStore);
-        qsettings.setValue(settingKey + settingStorageTypeSuffix, QVariant::typeToName(valueToStore.type()));
+        qsettings.setValue(settingKey + settingStorageTypeSuffix, QLatin1String(QVariant::typeToName(valueToStore.type())));
 #endif // QT_NO_SETTINGS
     }
@@ -221 +221 @@
 #endif
     if (!inspectorUrl.isValid())
-        inspectorUrl = QUrl("qrc:/webkit/inspector/inspector.html");
+        inspectorUrl = QUrl(QLatin1String("qrc:/webkit/inspector/inspector.html"));
 
 #ifndef QT_NO_PROPERTIES

trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp

@@ -74 +74 @@
     for (int i = 0; i < field.size(); i++) {
         QChar c = field[i];
-        if (c == (QChar)' ') {
+        if (c == QLatin1Char(' '))
             numSpaces++;
-        } else if ((c >= (QChar)'0') && (c <= (QChar)'9')) {
-            nString.append((QChar)c);
-        }
+        else if ((c >= QLatin1Char('0')) && (c <= QLatin1Char('9')))
+            nString.append(c);
     }
     quint32 num = nString.toLong();
@@ -196 +195 @@
                 m_contentType = header.contentType().toLatin1();
                 m_contentLength = header.contentLength();
-                if (header.hasKey("Upgrade") && (header.value("Upgrade") == QLatin1String("WebSocket")))
+                if (header.hasKey(QLatin1String("Upgrade")) && (header.value(QLatin1String("Upgrade")) == QLatin1String("WebSocket")))
                     isWebSocket = true;
 
@@ -205 +204 @@
 
     if (m_endOfHeaders) {
-        QStringList pathAndQuery = m_path.split("?");
+        QStringList pathAndQuery = m_path.split(QLatin1Char('?'));
         m_path = pathAndQuery[0];
-        QStringList words = m_path.split(QString::fromLatin1("/"));
+        QStringList words = m_path.split(QLatin1Char('/'));
 
         if (isWebSocket) {
@@ -217 +216 @@
                 QByteArray key3 = m_tcpConnection->read(8);
 
-                quint32 number1 = parseWebSocketChallengeNumber(header.value("Sec-WebSocket-Key1"));
-                quint32 number2 = parseWebSocketChallengeNumber(header.value("Sec-WebSocket-Key2"));
+                quint32 number1 = parseWebSocketChallengeNumber(header.value(QLatin1String("Sec-WebSocket-Key1")));
+                quint32 number2 = parseWebSocketChallengeNumber(header.value(QLatin1String("Sec-WebSocket-Key2")));
 
                 char responseData[16];
@@ -224 +223 @@
                 QByteArray response(responseData, sizeof(responseData));
 
-                QHttpResponseHeader responseHeader(101, "WebSocket Protocol Handshake", 1, 1);
-                responseHeader.setValue("Upgrade", header.value("Upgrade"));
-                responseHeader.setValue("Connection", header.value("Connection"));
-                responseHeader.setValue("Sec-WebSocket-Origin", header.value("Origin"));
-                responseHeader.setValue("Sec-WebSocket-Location", ("ws://" + header.value("Host") + m_path));
+                QHttpResponseHeader responseHeader(101, QLatin1String("WebSocket Protocol Handshake"), 1, 1);
+                responseHeader.setValue(QLatin1String("Upgrade"), header.value(QLatin1String("Upgrade")));
+                responseHeader.setValue(QLatin1String("Connection"), header.value(QLatin1String("Connection")));
+                responseHeader.setValue(QLatin1String("Sec-WebSocket-Origin"), header.value(QLatin1String("Origin")));
+                responseHeader.setValue(QLatin1String("Sec-WebSocket-Location"), (QLatin1String("ws://") + header.value(QLatin1String("Host")) + m_path));
                 responseHeader.setContentLength(response.size());
                 m_tcpConnection->write(responseHeader.toString().toLatin1());
@@ -260 +259 @@
 
         // If no path is specified, generate an index page.
-        if ((m_path == "") || (m_path == "/")) {
-            QString indexHtml = "<html><head><title>Remote Web Inspector</title></head><body><ul>\n";
+        if (m_path.isEmpty() || (m_path == QString(QLatin1Char('/')))) {
+            QString indexHtml = QLatin1String("<html><head><title>Remote Web Inspector</title></head><body><ul>\n");
             for (QMap<int, InspectorClientQt* >::const_iterator it = m_server->m_inspectorClients.begin();
                  it != m_server->m_inspectorClients.end(); 
                  ++it) {
-                indexHtml.append(QString("<li><a href=\"/webkit/inspector/inspector.html?page=%1\">%2</li>\n")
+                indexHtml.append(QString::fromLatin1("<li><a href=\"/webkit/inspector/inspector.html?page=%1\">%2</li>\n")
                                  .arg(it.key())
                                  .arg(it.value()->m_inspectedWebPage->mainFrame()->url().toString()));
             }
-            indexHtml.append("</ul></body></html>");
+            indexHtml.append(QLatin1String("</ul></body></html>"));
             response = indexHtml.toLatin1();
         } else {
-            QString path = QString(":%1").arg(m_path);
+            QString path = QString::fromLatin1(":%1").arg(m_path);
             QFile file(path);
             // It seems that there should be an enum or define for these status codes somewhere in Qt or WebKit,