[webkit-changes] cvs commit: WebCore/khtml/xml dom_textimpl.cpp
dom_textimpl.h
Darin
darin at opensource.apple.com
Mon Aug 29 11:00:47 PDT 2005
darin 05/08/29 11:00:47
Modified: . ChangeLog
khtml/editing composite_edit_command.cpp selection.cpp
visible_text.cpp
khtml/html htmlparser.cpp
khtml/rendering render_text.cpp render_text.h
khtml/xml dom_textimpl.cpp dom_textimpl.h
Log:
Reviewed by John Sullivan.
- fixed cases where I changed functions from string() to qstring() incorrectly
* khtml/rendering/render_text.h: Change function name back to string().
* khtml/xml/dom_textimpl.h: Ditto.
* khtml/xml/dom_textimpl.cpp:
(CommentImpl::nodeName): Call domString(), not qstring().
(TextImpl::nodeName): Ditto.
* khtml/editing/composite_edit_command.cpp:
(khtml::CompositeEditCommand::deleteInsignificantText):
* khtml/editing/selection.cpp:
(khtml::Selection::debugRenderer):
* khtml/editing/visible_text.cpp:
(khtml::TextIterator::handleTextNode):
(khtml::TextIterator::handleTextBox):
* khtml/html/htmlparser.cpp:
(HTMLParser::handleError):
* khtml/rendering/render_text.cpp:
(InlineTextBox::paint):
(InlineTextBox::selectionStartEnd):
(RenderText::originalString):
(RenderTextFragment::originalString):
Change callers back from qstring() to string().
Revision Changes Path
1.34 +29 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog 29 Aug 2005 17:42:42 -0000 1.33
+++ ChangeLog 29 Aug 2005 18:00:42 -0000 1.34
@@ -1,3 +1,32 @@
+2005-08-29 Darin Adler <darin at apple.com>
+
+ Reviewed by John Sullivan.
+
+ - fixed cases where I changed functions from string() to qstring() incorrectly
+
+ * khtml/rendering/render_text.h: Change function name back to string().
+ * khtml/xml/dom_textimpl.h: Ditto.
+
+ * khtml/xml/dom_textimpl.cpp:
+ (CommentImpl::nodeName): Call domString(), not qstring().
+ (TextImpl::nodeName): Ditto.
+
+ * khtml/editing/composite_edit_command.cpp:
+ (khtml::CompositeEditCommand::deleteInsignificantText):
+ * khtml/editing/selection.cpp:
+ (khtml::Selection::debugRenderer):
+ * khtml/editing/visible_text.cpp:
+ (khtml::TextIterator::handleTextNode):
+ (khtml::TextIterator::handleTextBox):
+ * khtml/html/htmlparser.cpp:
+ (HTMLParser::handleError):
+ * khtml/rendering/render_text.cpp:
+ (InlineTextBox::paint):
+ (InlineTextBox::selectionStartEnd):
+ (RenderText::originalString):
+ (RenderTextFragment::originalString):
+ Change callers back from qstring() to string().
+
2005-08-29 John Sullivan <sullivan at apple.com>
Reviewed by Beth Dakin.
1.10 +1 -1 WebCore/khtml/editing/composite_edit_command.cpp
Index: composite_edit_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/composite_edit_command.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- composite_edit_command.cpp 25 Aug 2005 23:13:44 -0000 1.9
+++ composite_edit_command.cpp 29 Aug 2005 18:00:43 -0000 1.10
@@ -365,7 +365,7 @@
gapStart = kMax(gapStart, start);
gapEnd = kMin(gapEnd, end);
if (!str) {
- str = textNode->qstring()->substring(start, end - start);
+ str = textNode->string()->substring(start, end - start);
str->ref();
}
// remove text in the gap
1.92 +1 -1 WebCore/khtml/editing/selection.cpp
Index: selection.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/selection.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- selection.cpp 25 Aug 2005 17:47:05 -0000 1.91
+++ selection.cpp 29 Aug 2005 18:00:43 -0000 1.92
@@ -947,7 +947,7 @@
}
static const int max = 36;
- QString text = DOMString(textRenderer->qstring()).qstring();
+ QString text = DOMString(textRenderer->string()).qstring();
int textLength = text.length();
if (selected) {
int offset = 0;
1.36 +2 -2 WebCore/khtml/editing/visible_text.cpp
Index: visible_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/visible_text.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- visible_text.cpp 25 Aug 2005 23:13:45 -0000 1.35
+++ visible_text.cpp 29 Aug 2005 18:00:43 -0000 1.36
@@ -217,7 +217,7 @@
m_lastTextNode = m_node;
RenderText *renderer = static_cast<RenderText *>(m_node->renderer());
- DOMString str = renderer->qstring();
+ DOMString str = renderer->string();
// handle pre-formatted text
if (renderer->style()->whiteSpace() == khtml::PRE) {
@@ -267,7 +267,7 @@
void TextIterator::handleTextBox()
{
RenderText *renderer = static_cast<RenderText *>(m_node->renderer());
- DOMString str = renderer->qstring();
+ DOMString str = renderer->string();
long start = m_offset;
long end = (m_node == m_endContainer) ? m_endOffset : LONG_MAX;
while (m_textBox) {
1.107 +1 -1 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- htmlparser.cpp 25 Aug 2005 23:13:50 -0000 1.106
+++ htmlparser.cpp 29 Aug 2005 18:00:44 -0000 1.107
@@ -505,7 +505,7 @@
TextImpl *t = static_cast<TextImpl *>(n);
if (t->containsOnlyWhitespace())
return false;
- DOMStringImpl *i = t->qstring();
+ DOMStringImpl *i = t->string();
unsigned int pos = 0;
while (pos < i->l && (*(i->s+pos) == QChar(' ') ||
*(i->s+pos) == QChar(0xa0))) pos++;
1.191 +9 -9 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- render_text.cpp 25 Aug 2005 17:47:16 -0000 1.190
+++ render_text.cpp 29 Aug 2005 18:00:45 -0000 1.191
@@ -384,7 +384,7 @@
if (m_truncation != cNoTruncation)
endPoint = m_truncation - m_start;
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->qstring()->s, textObject()->qstring()->l, m_start, endPoint,
+ textObject()->string()->s, textObject()->string()->l, m_start, endPoint,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered());
} else {
int sPos, ePos;
@@ -393,17 +393,17 @@
// paint only the text that is not selected
if (sPos >= ePos) {
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
+ textObject()->string()->s, textObject()->string()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered());
} else {
if (sPos - 1 >= 0) {
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
+ textObject()->string()->s, textObject()->string()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered(), 0, sPos);
}
if (ePos < m_start + m_len) {
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
+ textObject()->string()->s, textObject()->string()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered(), ePos, -1);
}
}
@@ -420,7 +420,7 @@
selectionTextShadow->blur,
selectionTextShadow->color);
font->drawText(i.p, m_x + tx, m_y + ty + m_baseline, textObject()->tabWidth(), textPos(),
- textObject()->qstring()->s, textObject()->qstring()->l, m_start, m_len,
+ textObject()->string()->s, textObject()->string()->l, m_start, m_len,
m_toAdd, m_reversed ? QPainter::RTL : QPainter::LTR, styleToUse->visuallyOrdered(), sPos, ePos);
if (selectionTextShadow)
i.p->clearShadow();
@@ -489,11 +489,11 @@
int startPos, endPos;
if (object()->selectionState() == RenderObject::SelectionInside) {
startPos = 0;
- endPos = textObject()->qstring()->l;
+ endPos = textObject()->string()->l;
} else {
textObject()->selectionStartEnd(startPos, endPos);
if (object()->selectionState() == RenderObject::SelectionStart)
- endPos = textObject()->qstring()->l;
+ endPos = textObject()->string()->l;
else if (object()->selectionState() == RenderObject::SelectionEnd)
startPos = 0;
}
@@ -901,7 +901,7 @@
DOM::DOMStringImpl* RenderText::originalString() const
{
- return element() ? element()->qstring() : 0;
+ return element() ? element()->string() : 0;
}
void RenderText::absoluteRects(QValueList<QRect>& rects, int _tx, int _ty)
@@ -1892,7 +1892,7 @@
{
DOM::DOMStringImpl* result = 0;
if (element())
- result = element()->qstring();
+ result = element()->string();
else
result = contentString();
if (result && (start() > 0 || start() < result->l))
1.85 +1 -1 WebCore/khtml/rendering/render_text.h
Index: render_text.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- render_text.h 25 Aug 2005 17:47:16 -0000 1.84
+++ render_text.h 29 Aug 2005 18:00:45 -0000 1.85
@@ -178,7 +178,7 @@
virtual void detach();
DOM::DOMString data() const { return str; }
- DOM::DOMStringImpl *qstring() const { return str; }
+ DOM::DOMStringImpl *string() const { return str; }
virtual InlineBox* createInlineBox(bool,bool, bool isOnlyRun = false);
virtual void dirtyLineBoxes(bool fullLayout, bool isRootInlineBox = false);
1.28 +2 -2 WebCore/khtml/xml/dom_textimpl.cpp
Index: dom_textimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dom_textimpl.cpp 25 Aug 2005 17:47:21 -0000 1.27
+++ dom_textimpl.cpp 29 Aug 2005 18:00:46 -0000 1.28
@@ -310,7 +310,7 @@
DOMString CommentImpl::nodeName() const
{
- return commentAtom.qstring();
+ return commentAtom.domString();
}
unsigned short CommentImpl::nodeType() const
@@ -400,7 +400,7 @@
DOMString TextImpl::nodeName() const
{
- return textAtom.qstring();
+ return textAtom.domString();
}
unsigned short TextImpl::nodeType() const
1.19 +1 -1 WebCore/khtml/xml/dom_textimpl.h
Index: dom_textimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dom_textimpl.h 25 Aug 2005 17:47:21 -0000 1.18
+++ dom_textimpl.h 29 Aug 2005 18:00:46 -0000 1.19
@@ -63,7 +63,7 @@
// Other methods (not part of DOM)
- DOMStringImpl *qstring() { return str; }
+ DOMStringImpl *string() { return str; }
virtual void checkCharDataOperation( const unsigned long offset, int &exceptioncode );
virtual long maxOffset() const;
More information about the webkit-changes
mailing list