summaryrefslogtreecommitdiffstats
path: root/khtml/khtml_caret.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:59:13 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /khtml/khtml_caret.cpp
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'khtml/khtml_caret.cpp')
-rw-r--r--khtml/khtml_caret.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp
index 9b819ee6c..0946685cb 100644
--- a/khtml/khtml_caret.cpp
+++ b/khtml/khtml_caret.cpp
@@ -775,7 +775,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM
caret_boxes.append(caretBox);
// afaik an inner flow box can only have the width 0, therefore we don't
- // have to care for rtl or alignment
+ // have to care for rtl or tqalignment
// ### can empty inline elements have a width? css 2 spec isn't verbose about it
caretBox->_y += flowBox->baseline() - fm.ascent();
@@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar()
if (_offset == box->maxOffset())
peekNext();
else if (b && !box->isOutside() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
else
_char = -1;
}
@@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl;
readchar:
// get character
if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset())
- _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
else
_char = -1;
}/*end if*/
@@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl;
// _peekNext = b;
// get character
if (b && !box->isOutside() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
else
_char = -1;
@@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl;
#endif
// get character
if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox())
- _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode();
+ _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode();
else if (b && _offset < b->maxOffset() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
else
_char = -1;
}/*end if*/
@@ -2103,7 +2103,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
int n = (int)row->row->size();
int i;
for (i = 0; i < n; i++) {
- RenderTableCell *cell = row->row->at(i);
+ RenderTableCell *cell = row->row->tqat(i);
if (!cell || (long)cell == -1) continue;
int absx, absy;
@@ -2127,7 +2127,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
int index = i - ((cnt >> 1) + 1)*(cnt & 1) + (cnt >> 1)*!(cnt & 1);
if (index < 0 || index >= n) continue;
- RenderTableCell *cell = row->row->at(index);
+ RenderTableCell *cell = row->row->tqat(index);
if (!cell || (long)cell == -1) continue;
#if DEBUG_CARETMODE > 1
@@ -2227,7 +2227,7 @@ static int findRowInSection(RenderTableSection *section, RenderTableCell *cell,
// check for cell
int m = row->row->size();
for (int j = 0; j < m; j++) {
- RenderTableCell *c = row->row->at(j);
+ RenderTableCell *c = row->row->tqat(j);
if (c == directCell) return i;
}/*next j*/