Changeset 32486 in webkit

Timestamp:

Apr 24, 2008 6:45:27 AM (16 years ago)

Author:

Simon Hausmann

Message:

Paul Olav Tvete <​paul@trolltech.com>

Fix various compiler warnings related to QString(const char *)
construction by using QLatin1String.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/qt/qt_instance.cpp (modified) (2 diffs)
• dom/XMLTokenizer.cpp (modified) (2 diffs)
• platform/graphics/qt/PathQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-24  Paul Olav Tvete <paul@trolltech.com>
+
+        Reviewed by Simon.
+
+        Fix various compiler warnings related to QString(const char *)
+        construction by using QLatin1String.
+
+        * bridge/qt/qt_instance.cpp:
+        (KJS::Bindings::QtField::valueFromInstance):
+        (KJS::Bindings::QtField::setValueToInstance):
+        * dom/XMLTokenizer.cpp:
+        (WebCore::):
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::debugString):
+
 2008-04-24  Morten Johan Sørvig  <msorvig@trolltech.com>
 

trunk/WebCore/bridge/qt/qt_instance.cpp

@@ -379 +379 @@
         return ret;
     } else {
-        QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(name());
+        QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name()));
         return throwError(exec, GeneralError, msg.toLatin1().constData());
     }
@@ -404 +404 @@
             obj->setProperty(m_dynamicProperty.constData(), val);
     } else {
-        QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(name());
+        QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name()));
         throwError(exec, GeneralError, msg.toLatin1().constData());
     }

trunk/WebCore/dom/XMLTokenizer.cpp

@@ -1690 +1690 @@
 #else
     QXmlStreamReader stream;
-    QString dummy = QString("<?xml version=\"1.0\"?><attrs %1 />").arg(string);
+    QString dummy = QString(QLatin1String("<?xml version=\"1.0\"?><attrs %1 />")).arg(string);
     stream.addData(dummy);
     while (!stream.atEnd()) {
@@ -2094 +2094 @@
 
     //qDebug() << dtd << name << publicId << systemId;
-    if ((publicId == "-//W3C//DTD XHTML 1.0 Transitional//EN")
-        || (publicId == "-//W3C//DTD XHTML 1.1//EN")
-        || (publicId == "-//W3C//DTD XHTML 1.0 Strict//EN")
-        || (publicId == "-//W3C//DTD XHTML 1.0 Frameset//EN")
-        || (publicId == "-//W3C//DTD XHTML Basic 1.0//EN")
-        || (publicId == "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN")
-        || (publicId == "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN")
-        || (publicId == "-//WAPFORUM//DTD XHTML Mobile 1.0//EN")) {
+    if ((publicId == QLatin1String("-//W3C//DTD XHTML 1.0 Transitional//EN"))
+        || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1//EN"))
+        || (publicId == QLatin1String("-//W3C//DTD XHTML 1.0 Strict//EN"))
+        || (publicId == QLatin1String("-//W3C//DTD XHTML 1.0 Frameset//EN"))
+        || (publicId == QLatin1String("-//W3C//DTD XHTML Basic 1.0//EN"))
+        || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"))
+        || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"))
+        || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.0//EN"))) {
         setIsXHTMLDocument(true); // controls if we replace entities or not.
     }

trunk/WebCore/platform/graphics/qt/PathQt.cpp

@@ -195 +195 @@
         switch (cur.type) {
             case QPainterPath::MoveToElement:
-                ret += QString("M %1 %2").arg(cur.x).arg(cur.y);
+                ret += QString(QLatin1String("M %1 %2")).arg(cur.x).arg(cur.y);
                 break;
             case QPainterPath::LineToElement:
-                ret += QString("L %1 %2").arg(cur.x).arg(cur.y);
+                ret += QString(QLatin1String("L %1 %2")).arg(cur.x).arg(cur.y);
                 break;
             case QPainterPath::CurveToElement:
@@ -208 +208 @@
                 Q_ASSERT(c2.type == QPainterPath::CurveToDataElement);
 
-                ret += QString("C %1 %2 %3 %4 %5 %6").arg(cur.x).arg(cur.y).arg(c1.x).arg(c1.y).arg(c2.x).arg(c2.y);
+                ret += QString(QLatin1String("C %1 %2 %3 %4 %5 %6")).arg(cur.x).arg(cur.y).arg(c1.x).arg(c1.y).arg(c2.x).arg(c2.y);
 
                 i += 2;