Changeset 32486 in webkit
- Timestamp:
- Apr 24, 2008 6:45:27 AM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r32484 r32486 1 2008-04-24 Paul Olav Tvete <paul@trolltech.com> 2 3 Reviewed by Simon. 4 5 Fix various compiler warnings related to QString(const char *) 6 construction by using QLatin1String. 7 8 * bridge/qt/qt_instance.cpp: 9 (KJS::Bindings::QtField::valueFromInstance): 10 (KJS::Bindings::QtField::setValueToInstance): 11 * dom/XMLTokenizer.cpp: 12 (WebCore::): 13 * platform/graphics/qt/PathQt.cpp: 14 (WebCore::Path::debugString): 15 1 16 2008-04-24 Morten Johan Sørvig <msorvig@trolltech.com> 2 17 -
trunk/WebCore/bridge/qt/qt_instance.cpp
r32392 r32486 379 379 return ret; 380 380 } else { 381 QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg( name());381 QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name())); 382 382 return throwError(exec, GeneralError, msg.toLatin1().constData()); 383 383 } … … 404 404 obj->setProperty(m_dynamicProperty.constData(), val); 405 405 } else { 406 QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg( name());406 QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name())); 407 407 throwError(exec, GeneralError, msg.toLatin1().constData()); 408 408 } -
trunk/WebCore/dom/XMLTokenizer.cpp
r31860 r32486 1690 1690 #else 1691 1691 QXmlStreamReader stream; 1692 QString dummy = QString( "<?xml version=\"1.0\"?><attrs %1 />").arg(string);1692 QString dummy = QString(QLatin1String("<?xml version=\"1.0\"?><attrs %1 />")).arg(string); 1693 1693 stream.addData(dummy); 1694 1694 while (!stream.atEnd()) { … … 2094 2094 2095 2095 //qDebug() << dtd << name << publicId << systemId; 2096 if ((publicId == "-//W3C//DTD XHTML 1.0 Transitional//EN")2097 || (publicId == "-//W3C//DTD XHTML 1.1//EN")2098 || (publicId == "-//W3C//DTD XHTML 1.0 Strict//EN")2099 || (publicId == "-//W3C//DTD XHTML 1.0 Frameset//EN")2100 || (publicId == "-//W3C//DTD XHTML Basic 1.0//EN")2101 || (publicId == "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN")2102 || (publicId == "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN")2103 || (publicId == "-//WAPFORUM//DTD XHTML Mobile 1.0//EN")) {2096 if ((publicId == QLatin1String("-//W3C//DTD XHTML 1.0 Transitional//EN")) 2097 || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1//EN")) 2098 || (publicId == QLatin1String("-//W3C//DTD XHTML 1.0 Strict//EN")) 2099 || (publicId == QLatin1String("-//W3C//DTD XHTML 1.0 Frameset//EN")) 2100 || (publicId == QLatin1String("-//W3C//DTD XHTML Basic 1.0//EN")) 2101 || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN")) 2102 || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN")) 2103 || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.0//EN"))) { 2104 2104 setIsXHTMLDocument(true); // controls if we replace entities or not. 2105 2105 } -
trunk/WebCore/platform/graphics/qt/PathQt.cpp
r29663 r32486 195 195 switch (cur.type) { 196 196 case QPainterPath::MoveToElement: 197 ret += QString( "M %1 %2").arg(cur.x).arg(cur.y);197 ret += QString(QLatin1String("M %1 %2")).arg(cur.x).arg(cur.y); 198 198 break; 199 199 case QPainterPath::LineToElement: 200 ret += QString( "L %1 %2").arg(cur.x).arg(cur.y);200 ret += QString(QLatin1String("L %1 %2")).arg(cur.x).arg(cur.y); 201 201 break; 202 202 case QPainterPath::CurveToElement: … … 208 208 Q_ASSERT(c2.type == QPainterPath::CurveToDataElement); 209 209 210 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);210 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); 211 211 212 212 i += 2;
Note: See TracChangeset
for help on using the changeset viewer.