diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-08 07:19:45 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-08 07:19:45 (GMT) |
| commit | 4b48d16a6ef2f972e9cc2af1ea8f4f146be9849c (patch) | |
| tree | 34bc37d7d64f88f047f04fb7e6c61dba6742da85 /tools/linguist/lupdate/cpp.cpp | |
| parent | 28f84d2ed4000391f855140f57c359bc858d4799 (diff) | |
| parent | f2187e31de13a6ab8631a9067487dab555f7c2e7 (diff) | |
| download | Qt-4b48d16a6ef2f972e9cc2af1ea8f4f146be9849c.zip Qt-4b48d16a6ef2f972e9cc2af1ea8f4f146be9849c.tar.gz Qt-4b48d16a6ef2f972e9cc2af1ea8f4f146be9849c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/linguist/lupdate/cpp.cpp')
| -rw-r--r-- | tools/linguist/lupdate/cpp.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp index 609bd3d..bc9bb26 100644 --- a/tools/linguist/lupdate/cpp.cpp +++ b/tools/linguist/lupdate/cpp.cpp @@ -1686,9 +1686,14 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions) HashString ns = HashString(text); yyTok = getToken(); if (yyTok == Tok_LeftBrace) { + yyTok = getToken(); namespaceDepths.push(namespaces.count()); enterNamespace(&namespaces, ns); - yyTok = getToken(); + + functionContext = namespaces; + functionContextUnresolved.clear(); + prospectiveContext.clear(); + pendingContext.clear(); } else if (yyTok == Tok_Equals) { // e.g. namespace Is = OuterSpace::InnerSpace; QList<HashString> fullName; |