diff options
| author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-02-08 14:39:17 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-02-08 15:40:17 +0000 |
| commit | dc90b2c0c48eeddfc4508d41e0197e8b30b9f9e5 (patch) | |
| tree | f34f4da359a30794d25172bf6a3e90ee5e5914bd /src/qdoc/cppcodemarker.cpp | |
| parent | ca81f8e469faba11f622af9a9ec537a7b3cec08f (diff) | |
| download | qttools-dc90b2c0c48eeddfc4508d41e0197e8b30b9f9e5.tar.gz | |
qdoc: Implement support for C++11 default/delete declarations.
Task-number: QTBUG-50870
Change-Id: I8ce46e41e880ece93c9e6e09f2e01f1047de1622
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
| -rw-r--r-- | src/qdoc/cppcodemarker.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index b0e4e823d..ff3579b08 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -181,6 +181,10 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, synopsis.prepend("virtual "); if (func->virtualness() == FunctionNode::PureVirtual) synopsis.append(" = 0"); + else if (func->isDeleted()) + synopsis.append(" = delete"); + else if (func->isDefaulted()) + synopsis.append(" = default"); } else if (style == Subpage) { if (!func->returnType().isEmpty() && func->returnType() != "void") @@ -190,8 +194,11 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, QStringList bracketed; if (func->isStatic()) { bracketed += "static"; - } - else if (func->virtualness() != FunctionNode::NonVirtual) { + } else if (func->isDeleted()) { + bracketed += "delete"; + } else if (func->isDefaulted()) { + bracketed += "default"; + } else if (func->virtualness() != FunctionNode::NonVirtual) { if (func->virtualness() == FunctionNode::PureVirtual) bracketed += "pure"; bracketed += "virtual"; |
