<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55837] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/55837">55837</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-11 01:43:08 -0800 (Thu, 11 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Qt] Unreviewed buildfix after <a href="http://trac.webkit.org/projects/webkit/changeset/55833">r55833</a>.

Rename all instances of data() to characters()

* bridge/qt/qt_class.cpp:
(JSC::Bindings::QtClass::fieldNamed):
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertValueToQVariant):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebridgeqtqt_classcpp">trunk/WebCore/bridge/qt/qt_class.cpp</a></li>
<li><a href="#trunkWebCorebridgeqtqt_runtimecpp">trunk/WebCore/bridge/qt/qt_runtime.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (55836 => 55837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-11 09:29:28 UTC (rev 55836)
+++ trunk/WebCore/ChangeLog        2010-03-11 09:43:08 UTC (rev 55837)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2010-03-11  Csaba Osztrogon√°c  &lt;ossy@webkit.org&gt;
+
+        [Qt] Unreviewed buildfix after r55833.
+
+        Rename all instances of data() to characters()
+
+        * bridge/qt/qt_class.cpp:
+        (JSC::Bindings::QtClass::fieldNamed):
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertValueToQVariant):
+
</ins><span class="cx"> 2010-03-11  Zoltan Horvath  &lt;zoltan@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Hausmann.
</span></span></pre></div>
<a id="trunkWebCorebridgeqtqt_classcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bridge/qt/qt_class.cpp (55836 => 55837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bridge/qt/qt_class.cpp        2010-03-11 09:29:28 UTC (rev 55836)
+++ trunk/WebCore/bridge/qt/qt_class.cpp        2010-03-11 09:43:08 UTC (rev 55837)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> 
</span><span class="cx">     QObject* obj = qtinst-&gt;getObject();
</span><span class="cx">     UString ustring = identifier.ustring();
</span><del>-    QString objName((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+    QString objName((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx">     QByteArray ba = objName.toAscii();
</span><span class="cx"> 
</span><span class="cx">     // First check for a cached field
</span></span></pre></div>
<a id="trunkWebCorebridgeqtqt_runtimecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bridge/qt/qt_runtime.cpp (55836 => 55837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bridge/qt/qt_runtime.cpp        2010-03-11 09:29:28 UTC (rev 55836)
+++ trunk/WebCore/bridge/qt/qt_runtime.cpp        2010-03-11 09:43:08 UTC (rev 55837)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx">                     dist = 6;
</span><span class="cx">             } else {
</span><span class="cx">                 UString str = value.toString(exec);
</span><del>-                ret = QVariant(QChar(str.size() ? *(const ushort*)str.rep()-&gt;data() : 0));
</del><ins>+                ret = QVariant(QChar(str.size() ? *(const ushort*)str.rep()-&gt;characters() : 0));
</ins><span class="cx">                 if (type == String)
</span><span class="cx">                     dist = 3;
</span><span class="cx">                 else
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">                 return QString();
</span><span class="cx">             } else {
</span><span class="cx">                 UString ustring = value.toString(exec);
</span><del>-                ret = QVariant(QString((const QChar*)ustring.rep()-&gt;data(), ustring.size()));
</del><ins>+                ret = QVariant(QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size()));
</ins><span class="cx">                 if (type == String)
</span><span class="cx">                     dist = 0;
</span><span class="cx">                 else
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx">                         QVariant v = convertValueToQVariant(exec, val, QMetaType::Void, &amp;objdist, visitedObjects);
</span><span class="cx">                         if (objdist &gt;= 0) {
</span><span class="cx">                             UString ustring = (*it).ustring();
</span><del>-                            QString id = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                            QString id = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx">                             result.insert(id, v);
</span><span class="cx">                         }
</span><span class="cx">                     }
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx">                 for (int i = 0; i &lt; len; ++i) {
</span><span class="cx">                     JSValue val = rtarray-&gt;getConcreteArray()-&gt;valueAt(exec, i);
</span><span class="cx">                     UString ustring = val.toString(exec);
</span><del>-                    QString qstring = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                    QString qstring = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx"> 
</span><span class="cx">                     result.append(qstring);
</span><span class="cx">                 }
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx">                 for (int i = 0; i &lt; len; ++i) {
</span><span class="cx">                     JSValue val = array-&gt;get(exec, i);
</span><span class="cx">                     UString ustring = val.toString(exec);
</span><del>-                    QString qstring = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                    QString qstring = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx"> 
</span><span class="cx">                     result.append(qstring);
</span><span class="cx">                 }
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx">             } else {
</span><span class="cx">                 // Make a single length array
</span><span class="cx">                 UString ustring = value.toString(exec);
</span><del>-                QString qstring = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                QString qstring = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx">                 QStringList result;
</span><span class="cx">                 result.append(qstring);
</span><span class="cx">                 ret = QVariant(result);
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">                 dist = 0;
</span><span class="cx">             } else {
</span><span class="cx">                 UString ustring = value.toString(exec);
</span><del>-                ret = QVariant(QString((const QChar*)ustring.rep()-&gt;data(), ustring.size()).toLatin1());
</del><ins>+                ret = QVariant(QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size()).toLatin1());
</ins><span class="cx">                 if (type == String)
</span><span class="cx">                     dist = 5;
</span><span class="cx">                 else
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx">                 }
</span><span class="cx">             } else if (type == String) {
</span><span class="cx">                 UString ustring = value.toString(exec);
</span><del>-                QString qstring = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                QString qstring = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx"> 
</span><span class="cx">                 if (hint == QMetaType::QDateTime) {
</span><span class="cx">                     QDateTime dt = QDateTime::fromString(qstring, Qt::ISODate);
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> */
</span><span class="cx">                 // Attempt to convert.. a bit risky
</span><span class="cx">                 UString ustring = value.toString(exec);
</span><del>-                QString qstring = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                QString qstring = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx"> 
</span><span class="cx">                 // this is of the form '/xxxxxx/i'
</span><span class="cx">                 int firstSlash = qstring.indexOf(QLatin1Char('/'));
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx">                 }
</span><span class="cx">             } else if (type == String) {
</span><span class="cx">                 UString ustring = value.toString(exec);
</span><del>-                QString qstring = QString((const QChar*)ustring.rep()-&gt;data(), ustring.size());
</del><ins>+                QString qstring = QString((const QChar*)ustring.rep()-&gt;characters(), ustring.size());
</ins><span class="cx"> 
</span><span class="cx">                 QRegExp re(qstring);
</span><span class="cx">                 if (re.isValid()) {
</span></span></pre>
</div>
</div>

</body>
</html>