summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2019-09-07 00:07:26 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-09-11 17:21:50 +0100
commit18644c89f66091bdde23c7e491c763b49ff4fe2a (patch)
tree95a494d9f6b0ff7d2eb82e79f7340df3f1e9f5d0 /core
parent0e7fe1b852a28ffb1aae138184ba445a9460fe8d (diff)
downloadsubsurface-18644c89f66091bdde23c7e491c763b49ff4fe2a.tar.gz
Use and handle <br/> in DiveObjectHelper
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'core')
-rw-r--r--core/subsurface-qt/DiveObjectHelper.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp
index 0af3e432e..2825f1fe0 100644
--- a/core/subsurface-qt/DiveObjectHelper.cpp
+++ b/core/subsurface-qt/DiveObjectHelper.cpp
@@ -166,14 +166,16 @@ QString DiveObjectHelper::notes() const
#define _NOTES_BR "&#92n"
tmp.replace("<thead>", "<thead>" _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);
notes.setHtml(tmp);
tmp = notes.toPlainText();
- tmp.replace(_NOTES_BR, "<br>");
+ tmp.replace(_NOTES_BR, "<br/>");
#undef _NOTES_BR
} else {
- tmp.replace("\n", "<br>");
+ tmp.replace("\n", "<br/>");
}
return tmp;
}