fix: iterate all blocks

refactor: block iteration loop refactor: replaced checks with chop()
qTox · Mar 12, 2017 · 7a5c5a8 · 7a5c5a8
1 parent aabf34e
commit 7a5c5a8
Showing 1 changed file with 28 additions and 21 deletions.
diff --git a/src/chatlog/content/text.cpp b/src/chatlog/content/text.cpp
@@ -337,32 +337,39 @@ QString Text::extractSanitizedText(int from, int to) const
         return "";
 
     QString txt;
-    QTextBlock block = doc->firstBlock();
 
-    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()) {
-            QTextImageFormat imgFmt = itr.fragment().charFormat().toImageFormat();
-            QString key = imgFmt.name(); // img key (eg. key::D for :D)
-            QString rune = key.mid(4);
-
-            if (pos >= from && pos < to) {
-                txt += rune;
-                ++pos;
-            }
-        } else {
-            for (QChar c : itr.fragment().text()) {
-                if (pos >= from && pos < to)
-                    txt += c;
-
-                ++pos;
+    QTextBlock begin = doc->findBlock(from);
+    QTextBlock end = doc->findBlock(to);
+    for (QTextBlock block = begin; block != end.next() && block.isValid(); block = block.next()) {
+        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()) {
+                QTextImageFormat imgFmt = itr.fragment().charFormat().toImageFormat();
+                QString key = imgFmt.name(); // img key (eg. key::D for :D)
+                QString rune = key.mid(4);
+
+                if (pos >= from && pos < to) {
+                    txt += rune;
+                    ++pos;
+                }
+            } else {
+                for (QChar c : itr.fragment().text()) {
+                    if (pos >= from && pos < to)
+                        txt += c;
+
+                    ++pos;
+                }
             }
         }
+
+        txt += '\n';
     }
 
+    txt.chop(1);
+
     return txt;
 }