Commit 7a4c56dd authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Improve spacing/style

parent dcf0e782
...@@ -1155,14 +1155,14 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters() ...@@ -1155,14 +1155,14 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters()
tmpIt = it; tmpIt = it;
int space = 0; int space = 0;
while(!space ) while (!space)
{ {
if(textString.length()) if (textString.length())
{ {
newString.append(textString); newString.append(textString);
// when textString is the start of the word // when textString is the start of the word
if(tmpIt == it) if (tmpIt == it)
{ {
NormalizedRect newRect(lineArea,pageWidth,pageHeight); NormalizedRect newRect(lineArea,pageWidth,pageHeight);
word.append(new TinyTextEntity(textString.normalized word.append(new TinyTextEntity(textString.normalized
...@@ -1176,17 +1176,17 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters() ...@@ -1176,17 +1176,17 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters()
} }
} }
it++; ++it;
/* /*
we must have to put this line before the if condition of it==itEnd we must have to put this line before the if condition of it==itEnd
otherwise the last character can be missed otherwise the last character can be missed
*/ */
if(it == itEnd) break; if (it == itEnd) break;
elementArea = (*it)->area.roundedGeometry(pageWidth,pageHeight); elementArea = (*it)->area.roundedGeometry(pageWidth,pageHeight);
if(!doesConsumeY(elementArea,lineArea,60)) if (!doesConsumeY(elementArea, lineArea, 60))
{ {
it--; --it;
break; break;
} }
...@@ -1200,7 +1200,7 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters() ...@@ -1200,7 +1200,7 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters()
space = elementArea.left() - lineArea.right(); space = elementArea.left() - lineArea.right();
if(space > 0 || space < 0) if (space > 0 || space < 0)
{ {
it--; it--;
break; break;
...@@ -1220,16 +1220,16 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters() ...@@ -1220,16 +1220,16 @@ QHash<QRect, RegionText> TextPagePrivate::makeWordFromCharacters()
} }
// if newString is not empty, save it // if newString is not empty, save it
if(newString.length()) if (newString.length())
{ {
const NormalizedRect newRect(lineArea,pageWidth,pageHeight); const NormalizedRect newRect(lineArea, pageWidth, pageHeight);
newList.append(new TinyTextEntity(newString.normalized newList.append(new TinyTextEntity(newString.normalized
(QString::NormalizationForm_KC), newRect )); (QString::NormalizationForm_KC), newRect));
const QRect rect = newRect.geometry(pageWidth,pageHeight); const QRect rect = newRect.geometry(pageWidth, pageHeight);
const RegionText regionWord(word,rect); const RegionText regionWord(word,rect);
// there may be more than one element in the same key // there may be more than one element in the same key
word_chars_map.insertMulti(rect,regionWord); word_chars_map.insertMulti(rect, regionWord);
index++; index++;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment