summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_text.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/rendering/render_text.cpp')
-rw-r--r--khtml/rendering/render_text.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index cc41a1688..f5fa2e373 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -738,7 +738,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena)
if (!arena)
arena = renderArena();
for(unsigned int i=0; i < len; i++) {
- InlineTextBox* s = m_lines.tqat(i);
+ InlineTextBox* s = m_lines.at(i);
if (s)
s->detach(arena);
m_lines.remove(i);
@@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth()
bool firstLine = true;
for(int i = 0; i < len; i++)
{
- unsigned short c = str->s[i].tqunicode();
+ unsigned short c = str->s[i].unicode();
bool isNewline = false;
// If line-breaks survive to here they are preserved
@@ -1056,7 +1056,7 @@ void RenderText::calcMinMaxWidth()
continue;
int wordlen = 0;
- while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) &&
+ while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].unicode() != SOFT_HYPHEN) &&
!(isBreakable( str->s, i+wordlen, str->l )) )
wordlen++;
@@ -1328,11 +1328,11 @@ short RenderText::width() const
return w;
}
-void RenderText::tqrepaint(Priority p)
+void RenderText::repaint(Priority p)
{
RenderObject *cb = containingBlock();
if(cb)
- cb->tqrepaint(p);
+ cb->repaint(p);
}
bool RenderText::isFixedWidthFont() const
@@ -1464,13 +1464,13 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s)
TQString result;
result += '"';
for (uint i = 0; i != s.length(); ++i) {
- TQChar c = s.tqat(i);
+ TQChar c = s.at(i);
if (c == '\\') {
result += "\\\\";
} else if (c == '"') {
result += "\\\"";
} else {
- ushort u = c.tqunicode();
+ ushort u = c.unicode();
if (u >= 0x20 && u < 0x7F) {
result += c;
} else {