summaryrefslogtreecommitdiff
path: root/src/bbcode.h
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2015-03-09 12:34:34 +0100
committerTannin <devnull@localhost>2015-03-09 12:34:34 +0100
commit7a1ae9b0f1560c9eda32e032796fbb3fd56ff236 (patch)
treedea71435ac1042cb008fcd9f7b1ec57e6ea91227 /src/bbcode.h
parentd45ebf134819e1559718681becca9c4139fb7151 (diff)
parentdb2954e8eb41da715b9e7d79a72e225797401413 (diff)
Merge with branch1.2
Diffstat (limited to 'src/bbcode.h')
-rw-r--r--src/bbcode.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bbcode.h b/src/bbcode.h
index f88e9a6c..708dfe71 100644
--- a/src/bbcode.h
+++ b/src/bbcode.h
@@ -29,7 +29,7 @@ namespace BBCode {
/**
* @brief convert a string with BB Code-Tags to HTML
* @param input the input string with BB tags
- * @param replaceOccured if not NULL, this parameter will be set to true if any bb tags were replaced
+ * @param replaceOccured if not nullptr, this parameter will be set to true if any bb tags were replaced
* @return the same string in html representation
**/
QString convertToHTML(const QString &input);