diff options
author | Martin Smith <martin.smith@theqtcompany.com> | 2016-02-22 15:39:02 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@theqtcompany.com> | 2016-02-26 12:06:03 +0000 |
commit | 184c8f82a0b2e7ed8d307c796a5ba92b66723abe (patch) | |
tree | fbecd7a0baf44b2b0b3b9e29a7418870170a9910 /src/qdoc/cppcodemarker.cpp | |
parent | 8237d6d1171d7d7d677eada7d49ab7b5d85b09e7 (diff) | |
download | qttools-184c8f82a0b2e7ed8d307c796a5ba92b66723abe.tar.gz |
qdoc: Avoid more unnecessary qdoc warnings
Now avoids qdoc warnings for undocumented copy-assignment
operators and move-assignment operators. This update also
improves the text output by surrounding it with <p> and </p>.
There was also a bit of refactoring.
Change-Id: I922c7083d17b9b911d81f818f51fe7623a78eb22
Task-number: QTBUG-50630
Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
-rw-r--r-- | src/qdoc/cppcodemarker.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index 23ac9df93..eb88346dc 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -154,7 +154,7 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, if (style != Subpage && !func->returnType().isEmpty()) synopsis = typified(func->returnType(), true); synopsis += name; - if (func->metaness() != FunctionNode::MacroWithoutParams) { + if (!func->isMacroWithoutParams()) { synopsis += QLatin1Char('('); if (!func->parameters().isEmpty()) { QVector<Parameter>::ConstIterator p = func->parameters().constBegin(); @@ -177,11 +177,11 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, synopsis += " const"; if (style == Summary || style == Accessors) { - if (func->virtualness() != FunctionNode::NonVirtual) + if (!func->isNonvirtual()) synopsis.prepend("virtual "); if (func->isFinal()) synopsis.append(" final"); - if (func->virtualness() == FunctionNode::PureVirtual) + if (func->isPureVirtual()) synopsis.append(" = 0"); else if (func->isDeleted()) synopsis.append(" = delete"); @@ -200,10 +200,10 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, bracketed += "delete"; } else if (func->isDefaulted()) { bracketed += "default"; - } else if (func->virtualness() != FunctionNode::NonVirtual) { + } else if (!func->isNonvirtual()) { if (func->isFinal()) bracketed += "final"; - if (func->virtualness() == FunctionNode::PureVirtual) + if (func->isPureVirtual()) bracketed += "pure"; bracketed += "virtual"; } @@ -215,10 +215,10 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, bracketed += "private"; } - if (func->metaness() == FunctionNode::Signal) { + if (func->isSignal()) { bracketed += "signal"; } - else if (func->metaness() == FunctionNode::Slot) { + else if (func->isSlot()) { bracketed += "slot"; } if (!bracketed.isEmpty()) @@ -541,8 +541,8 @@ QList<Section> CppCodeMarker::sections(const Aggregate *inner, bool isStatic = false; if ((*c)->type() == Node::Function) { const FunctionNode *func = (const FunctionNode *) *c; - isSlot = (func->metaness() == FunctionNode::Slot); - isSignal = (func->metaness() == FunctionNode::Signal); + isSlot = (func->isSlot()); + isSignal = (func->isSignal()); isStatic = func->isStatic(); if (func->hasAssociatedProperties() && !func->hasActiveAssociatedProperty()) { ++c; |