[webkit-changes] cvs commit: SVGSupport/kdom/css
CSSStyleSelector.cpp
Eric
eseidel at opensource.apple.com
Mon Sep 12 14:53:32 PDT 2005
eseidel 05/09/12 14:53:31
Modified: . ChangeLog
kdom Helper.cpp
kdom/core DOMStringImpl.cpp DocumentImpl.cpp
kdom/css CSSStyleSelector.cpp
Log:
Bug #: none
Submitted by: eseidel
Reviewed by: none, build fix only for svg.
Fixes build after qstring() -> string() rename this weekend.
* kdom/Helper.cpp:
(parseLength):
* kdom/core/DOMStringImpl.cpp:
(DOMStringImpl::toInt):
* kdom/core/DocumentImpl.cpp:
(DocumentImpl::getId):
* kdom/css/CSSStyleSelector.cpp:
(checkPseudoState):
Revision Changes Path
1.117 +15 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog 12 Sep 2005 04:42:29 -0000 1.116
+++ ChangeLog 12 Sep 2005 21:53:30 -0000 1.117
@@ -1,3 +1,18 @@
+2005-09-12 Eric Seidel <eseidel at apple.com>
+
+ No review, build fix, only affects SVG.
+
+ Fixes build after qstring() -> string() rename this weekend.
+
+ * kdom/Helper.cpp:
+ (parseLength):
+ * kdom/core/DOMStringImpl.cpp:
+ (DOMStringImpl::toInt):
+ * kdom/core/DocumentImpl.cpp:
+ (DocumentImpl::getId):
+ * kdom/css/CSSStyleSelector.cpp:
+ (checkPseudoState):
+
2005-09-11 Darin Adler <darin at apple.com>
Reviewed by John Sullivan.
1.6 +1 -1 SVGSupport/kdom/Helper.cpp
Index: Helper.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/Helper.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Helper.cpp 1 Sep 2005 07:32:56 -0000 1.5
+++ Helper.cpp 12 Sep 2005 21:53:30 -0000 1.6
@@ -385,7 +385,7 @@
++i;
bool ok;
- int r = QConstString(s, i).qstring().toInt(&ok);
+ int r = QConstString(s, i).string().toInt(&ok);
/* Skip over any remaining digits, we are not that accurate (5.5% => 5%) */
while(i < l && (s[i].isDigit() || s[i] == '.'))
1.6 +1 -1 SVGSupport/kdom/core/DOMStringImpl.cpp
Index: DOMStringImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/core/DOMStringImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMStringImpl.cpp 1 Sep 2005 07:33:33 -0000 1.5
+++ DOMStringImpl.cpp 12 Sep 2005 21:53:31 -0000 1.6
@@ -429,7 +429,7 @@
while(i < m_len && m_str[i].isDigit())
++i;
- return QConstString(m_str, i).qstring().toInt(ok);
+ return QConstString(m_str, i).string().toInt(ok);
}
DOMStringImpl *DOMStringImpl::copy() const
1.9 +10 -10 SVGSupport/kdom/core/DocumentImpl.cpp
Index: DocumentImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/core/DocumentImpl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DocumentImpl.cpp 8 Sep 2005 08:03:19 -0000 1.8
+++ DocumentImpl.cpp 12 Sep 2005 21:53:31 -0000 1.9
@@ -905,22 +905,22 @@
{
case NodeImpl::ElementId:
{
- if((id = interface->getTagID(n.qstring().ascii(), nameDOMString.length())))
+ if((id = interface->getTagID(n.string().ascii(), nameDOMString.length())))
return id;
// compatibility: upper case - case insensitive
- if((id = interface->getTagID(n.qstring().lower().ascii(), nameDOMString.length())))
+ if((id = interface->getTagID(n.string().lower().ascii(), nameDOMString.length())))
return id;
break;
}
default:
{
- if((id = interface->getAttrID(n.qstring().ascii(), nameDOMString.length())))
+ if((id = interface->getAttrID(n.string().ascii(), nameDOMString.length())))
return id;
// compatibility: upper case - case insensitive
- if((id = interface->getAttrID(n.qstring().lower().ascii(), nameDOMString.length())))
+ if((id = interface->getAttrID(n.string().lower().ascii(), nameDOMString.length())))
return id;
}
}
@@ -931,18 +931,18 @@
// compatibility mode has to lookup upper case
if(!nameImpl)
{
- id = (NodeImpl::Id) map->ids.find(n.qstring());
+ id = (NodeImpl::Id) map->ids.find(n.string());
if(!id && type != NodeImpl::NamespaceId)
- id = (NodeImpl::Id) map->ids.find(QString::fromLatin1("aliases: ") + n.qstring());
+ id = (NodeImpl::Id) map->ids.find(QString::fromLatin1("aliases: ") + n.string());
}
else
{
- id = (NodeImpl::Id) map->ids.find(n.qstring());
+ id = (NodeImpl::Id) map->ids.find(n.string());
if(!readonly && id && prefix && !prefix->isEmpty())
{
// we were called in registration mode... check if the alias exists
QConstString px(prefix->unicode(), prefix->length());
- QString qn(QString::fromLatin1("aliases: ") + px.qstring() + QString::fromLatin1(":") + n.qstring());
+ QString qn(QString::fromLatin1("aliases: ") + px.string() + QString::fromLatin1(":") + n.string());
if(!map->ids.find(qn))
map->ids.insert(qn, (NodeImpl::Id *)id);
}
@@ -962,13 +962,13 @@
NodeImpl::Id cid = map->count++ + map->idStart;
map->names.insert(cid, nameImpl);
nameImpl->ref();
- map->ids.insert(n.qstring(), (NodeImpl::Id *)cid);
+ map->ids.insert(n.string(), (NodeImpl::Id *)cid);
// and register an alias if needed for DOM1 methods compatibility
if(prefix && !prefix->isEmpty())
{
QConstString px(prefix->unicode(), prefix->length());
- QString qn(QString::fromLatin1("aliases: ") + px.qstring() + QString::fromLatin1(":") + n.qstring());
+ QString qn(QString::fromLatin1("aliases: ") + px.string() + QString::fromLatin1(":") + n.string());
if(!map->ids.find(qn))
map->ids.insert(qn, (NodeImpl::Id *)cid);
}
1.10 +1 -1 SVGSupport/kdom/css/CSSStyleSelector.cpp
Index: CSSStyleSelector.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/css/CSSStyleSelector.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CSSStyleSelector.cpp 8 Sep 2005 08:03:23 -0000 1.9
+++ CSSStyleSelector.cpp 12 Sep 2005 21:53:31 -0000 1.10
@@ -652,7 +652,7 @@
}
QConstString cu(attr.unicode(), attr.length());
- QString u = cu.qstring();
+ QString u = cu.string();
if(!u.contains(QString::fromLatin1("://")))
{
if(u[0] == '/')
More information about the webkit-changes
mailing list