StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix: iterate all blocks

Browse Source 
refactor: block iteration loop

refactor: replaced checks with chop()
This commit is contained in:
ezavod 2017-03-07 15:10:29 +01:00
parent aabf34ebad
commit 7a5c5a86fd
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/chatlog/content/text.cpp
View File

@ -337,32 +337,39 @@ QString Text::extractSanitizedText(int from, int to) const
return ""; return "";
QString txt; QString txt;
QTextBlock block = doc->firstBlock();
for (QTextBlock::Iterator itr = block.begin(); itr != block.end(); ++itr) { QTextBlock begin = doc->findBlock(from);
int pos = QTextBlock end = doc->findBlock(to);
itr.fragment() for (QTextBlock block = begin; block != end.next() && block.isValid(); block = block.next()) {
.position(); // fragment position -> position of the first character in the fragment for (QTextBlock::Iterator itr = block.begin(); itr != block.end(); ++itr) {
int pos =
itr.fragment()
.position(); // fragment position -> position of the first character in the fragment
if (itr.fragment().charFormat().isImageFormat()) { if (itr.fragment().charFormat().isImageFormat()) {
QTextImageFormat imgFmt = itr.fragment().charFormat().toImageFormat(); QTextImageFormat imgFmt = itr.fragment().charFormat().toImageFormat();
QString key = imgFmt.name(); // img key (eg. key::D for :D) QString key = imgFmt.name(); // img key (eg. key::D for :D)
QString rune = key.mid(4); QString rune = key.mid(4);
if (pos >= from && pos < to) { if (pos >= from && pos < to) {
txt += rune; txt += rune;
++pos; ++pos;
} }
} else { } else {
for (QChar c : itr.fragment().text()) { for (QChar c : itr.fragment().text()) {
if (pos >= from && pos < to) if (pos >= from && pos < to)
txt += c; txt += c;
++pos; ++pos;
}
} }
} }
txt += '\n';
} }
txt.chop(1);
return txt; return txt;
} }