diff options
Diffstat (limited to 'src/libs/qmljs/persistenttrie.cpp')
| -rw-r--r-- | src/libs/qmljs/persistenttrie.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/qmljs/persistenttrie.cpp b/src/libs/qmljs/persistenttrie.cpp index edc3015099..1d6c9bf5ba 100644 --- a/src/libs/qmljs/persistenttrie.cpp +++ b/src/libs/qmljs/persistenttrie.cpp @@ -309,7 +309,7 @@ std::pair<TrieNode::Ptr,int> TrieNode::intersectF( typedef TrieNode::Ptr P; typedef QMap<QString,int>::const_iterator MapIterator; if (v1.isNull() || v2.isNull()) - return std::make_pair(P(0), ((v1.isNull()) ? 1 : 0) | ((v2.isNull()) ? 2 : 0)); + return std::make_pair(P(nullptr), ((v1.isNull()) ? 1 : 0) | ((v2.isNull()) ? 2 : 0)); QString::const_iterator i = v1->prefix.constBegin()+index1, iEnd = v1->prefix.constEnd(); QString::const_iterator j = v2->prefix.constBegin(), jEnd = v2->prefix.constEnd(); while (i != iEnd && j != jEnd) { @@ -345,7 +345,7 @@ std::pair<TrieNode::Ptr,int> TrieNode::intersectF( foreach (P t2, v2->postfixes) if (t2->prefix.isEmpty()) return std::make_pair(v1,1); - return std::make_pair(P(0), 0); + return std::make_pair(P(nullptr), 0); } QMap<QString,int> p1, p2; QList<P> p3; @@ -427,7 +427,7 @@ std::pair<TrieNode::Ptr,int> TrieNode::intersectF( switch (sameV1V2) { case 0: if (p3.isEmpty()) - return std::make_pair(P(0),0); + return std::make_pair(P(nullptr),0); else return std::make_pair(TrieNode::create(v1->prefix,p3),0); case 2: @@ -451,7 +451,7 @@ std::pair<TrieNode::Ptr,int> TrieNode::intersectF( v1->prefix.left(index1).append(res.first->prefix), res.first->postfixes), 0); } - return std::make_pair(P(0), 0); + return std::make_pair(P(nullptr), 0); } else { // i != iEnd && j == jEnd foreach (P t2, v2->postfixes) @@ -459,7 +459,7 @@ std::pair<TrieNode::Ptr,int> TrieNode::intersectF( std::pair<P,int> res = intersectF(v1,t2,i-v1->prefix.constBegin()); return std::make_pair(res.first, (res.second & 1)); } - return std::make_pair(P(0), 0); + return std::make_pair(P(nullptr), 0); } } |