feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Include class name for inline functions in functionAt

Browse Source 
The code that constructed the fully qualified name used
enclosingNamespace() which skips classes.

Use LookupContext::fullyQualifiedName() instead.

Change-Id: Ic03a91c0fe120c52dc69f3e78e82a574458d8314
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Nikolai Kosjar
2014-11-11 10:44:06 +01:00
parent 682a348b7b
commit cefd1832ce
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/auto/cplusplus/lookup/tst_lookup.cpp
View File

@@ -164,20 +164,33 @@ void tst_Lookup::document_functionAt_data()
QTest::addColumn<int>("column");
QTest::addColumn<QString>("expectedFunction");
const QByteArray source = "\n"
QByteArray source = "\n"
"void Foo::Bar() {\n" // line 1
" \n" // line 2
" for (int i=0; i < 10; ++i) {\n"
" \n" // line 4
" }\n"
"}\n"; // line 7
const QString expectedFunction = QString::fromLatin1("Foo::Bar");
" \n"
" for (int i=0; i < 10; ++i) {\n" // line 3
" \n"
" }\n" // line 5
"}\n";
QString expectedFunction = QString::fromLatin1("Foo::Bar");
QTest::newRow("nonInline1") << source << 1 << 2 << QString();
QTest::newRow("nonInline2") << source << 1 << 11 << expectedFunction;
QTest::newRow("nonInline3") << source << 2 << 2 << expectedFunction;
QTest::newRow("nonInline4") << source << 3 << 10 << expectedFunction;
QTest::newRow("nonInline5") << source << 4 << 3 << expectedFunction;
QTest::newRow("nonInline6") << source << 6 << 1 << expectedFunction;
source = "\n"
"namespace N {\n" // line 1
"class C {\n"
" void f()\n" // line 3
" {\n"
" }\n" // line 5
"};\n"
"}\n"; // line 7
expectedFunction = QString::fromLatin1("N::C::f");
QTest::newRow("inline1") << source << 1 << 2 << QString();
QTest::newRow("inline2") << source << 2 << 10 << QString();
QTest::newRow("inline2") << source << 3 << 10 << expectedFunction;
}
void tst_Lookup::document_functionAt()