summaryrefslogtreecommitdiff
path: root/tests/cppsymbolsearcher
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-09-12 15:26:55 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-09-13 15:41:02 +0200
commit190fb44882d2999c7d58a04f9223e3bcc8c08399 (patch)
tree774ca0d94628e08691f3c0988430b513ea27a8c6 /tests/cppsymbolsearcher
parent75b0429e29531452b48662258cd20420ece736f7 (diff)
downloadqt-creator-190fb44882d2999c7d58a04f9223e3bcc8c08399.tar.gz
CppTools: Fix qualified ids in the symbol searcher
The leaves in the treeview contained qualified ids. Change-Id: I290eaf9b1e666b6879d6d4b1f2483cfe7fb85362 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'tests/cppsymbolsearcher')
-rw-r--r--tests/cppsymbolsearcher/testdata_basic/file1.cpp31
1 files changed, 25 insertions, 6 deletions
diff --git a/tests/cppsymbolsearcher/testdata_basic/file1.cpp b/tests/cppsymbolsearcher/testdata_basic/file1.cpp
index 75c772cfb2..98a5375237 100644
--- a/tests/cppsymbolsearcher/testdata_basic/file1.cpp
+++ b/tests/cppsymbolsearcher/testdata_basic/file1.cpp
@@ -1,9 +1,13 @@
// Copyright header
+#define GENERATE_FUNC void myFunctionGenerated() {}
+
//
// Symbols in a global namespace
//
+GENERATE_FUNC
+
int myVariable;
int myFunction(bool yesno, int number) {}
@@ -14,10 +18,13 @@ class MyClass
{
public:
MyClass() {}
- int function1();
- int function2(bool yesno, int number) {}
+ int functionDeclaredOnly();
+ int functionDefinedInClass(bool yesno, int number) {}
+ int functionDefinedOutSideClass(char c);
};
+int MyClass::functionDefinedOutSideClass(char c) {}
+
//
// Symbols in a named namespace
//
@@ -34,12 +41,18 @@ class MyClass
{
public:
MyClass() {}
- int function1();
- int function2(bool yesno, int number) {}
+ int functionDeclaredOnly();
+ int functionDefinedInClass(bool yesno, int number) {}
+ int functionDefinedOutSideClass(char c);
+ int functionDefinedOutSideClassAndNamespace(float x);
};
+int MyClass::functionDefinedOutSideClass(char c) {}
+
} // namespace MyNamespace
+int MyNamespace::MyClass::functionDefinedOutSideClassAndNamespace(float x) {}
+
//
// Symbols in an anonymous namespace
//
@@ -56,8 +69,14 @@ class MyClass
{
public:
MyClass() {}
- int function1();
- int function2(bool yesno, int number) {}
+ int functionDeclaredOnly();
+ int functionDefinedInClass(bool yesno, int number) {}
+ int functionDefinedOutSideClass(char c);
};
+int MyClass::functionDefinedOutSideClass(char c) {}
+
} // anonymous namespace
+
+
+int main() {}