mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use and handle <br/> in DiveObjectHelper

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2019-09-07 00:07:26 +02:00 • committed by Dirk Hohndel
parent 0e7fe1b852
commit 18644c89f6
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -166,14 +166,16 @@ QString DiveObjectHelper::notes() const
#define _NOTES_BR "&#92n" #define _NOTES_BR "&#92n"
tmp.replace("<thead>", "<thead>" _NOTES_BR) tmp.replace("<thead>", "<thead>" _NOTES_BR)
.replace("<br>", "<br>" _NOTES_BR) .replace("<br>", "<br>" _NOTES_BR)
.replace("<br/>", "<br/>" _NOTES_BR)
.replace("<br />", "<br />" _NOTES_BR)
.replace("<tr>", "<tr>" _NOTES_BR) .replace("<tr>", "<tr>" _NOTES_BR)
.replace("</tr>", "</tr>" _NOTES_BR); .replace("</tr>", "</tr>" _NOTES_BR);
notes.setHtml(tmp); notes.setHtml(tmp);
tmp = notes.toPlainText(); tmp = notes.toPlainText();
tmp.replace(_NOTES_BR, "<br>"); tmp.replace(_NOTES_BR, "<br/>");
#undef _NOTES_BR #undef _NOTES_BR
} else { } else {
tmp.replace("\n", "<br>"); tmp.replace("\n", "<br/>");
} }
return tmp; return tmp;
} }