diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp index 6ee0e7bc8c5..cd8768192b3 100644 --- a/src/plugins/cpptools/cpplocatorfilter_test.cpp +++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp @@ -175,9 +175,9 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << cppFunctionsFilter << QString::fromLatin1("function") << (QList() - << ResultData(_("function2(bool, int)"), _("MyClass")) - << ResultData(_("function2(bool, int)"), _("MyNamespace::MyClass")) - << ResultData(_("function2(bool, int)"), _("::MyClass")) + << ResultData(_("functionDefinedInClass(bool, int)"), _("MyClass")) + << ResultData(_("functionDefinedInClass(bool, int)"), _("MyNamespace::MyClass")) + << ResultData(_("functionDefinedInClass(bool, int)"), _("::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("::MyClass")) @@ -193,7 +193,7 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << _("mynamespace::") << (QList() << ResultData(_("MyClass()"), _("MyNamespace::MyClass")) - << ResultData(_("function2(bool, int)"), _("MyNamespace::MyClass")) + << ResultData(_("functionDefinedInClass(bool, int)"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), _("MyNamespace::MyClass")) << ResultData(_("myFunction(bool, int)"), _("MyNamespace")) @@ -255,8 +255,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter() << ResultData(_("int V2"), _("MyEnum")) << ResultData(_("MyClass"), _("")) << ResultData(_("MyClass"), _("MyClass")) - << ResultData(_("function1"), _("MyClass")) - << ResultData(_("function2"), _("MyClass")) + << ResultData(_("functionDeclaredOnly"), _("MyClass")) + << ResultData(_("functionDefinedInClass"), _("MyClass")) << ResultData(_("functionDefinedOutSideClass"), _("MyClass")) << ResultData(_("functionDefinedOutSideClass"), _("MyClass")) << ResultData(_("int myVariable"), _("MyNamespace")) @@ -266,8 +266,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter() << ResultData(_("int V2"), _("MyNamespace::MyEnum")) << ResultData(_("MyClass"), _("MyNamespace")) << ResultData(_("MyClass"), _("MyNamespace::MyClass")) - << ResultData(_("function1"), _("MyNamespace::MyClass")) - << ResultData(_("function2"), _("MyNamespace::MyClass")) + << ResultData(_("functionDeclaredOnly"), _("MyNamespace::MyClass")) + << ResultData(_("functionDefinedInClass"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClass"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClassAndNamespace"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClass"), _("MyNamespace::MyClass")) @@ -279,8 +279,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter() << ResultData(_("int V2"), _("::MyEnum")) << ResultData(_("MyClass"), _("")) << ResultData(_("MyClass"), _("::MyClass")) - << ResultData(_("function1"), _("::MyClass")) - << ResultData(_("function2"), _("::MyClass")) + << ResultData(_("functionDeclaredOnly"), _("::MyClass")) + << ResultData(_("functionDefinedInClass"), _("::MyClass")) << ResultData(_("functionDefinedOutSideClass"), _("::MyClass")) << ResultData(_("functionDefinedOutSideClass"), _("::MyClass")) << ResultData(_("main()"), _("")) diff --git a/tests/cpplocators/testdata_basic/file1.cpp b/tests/cpplocators/testdata_basic/file1.cpp index e652b13f071..98a53752377 100644 --- a/tests/cpplocators/testdata_basic/file1.cpp +++ b/tests/cpplocators/testdata_basic/file1.cpp @@ -18,8 +18,8 @@ class MyClass { public: MyClass() {} - int function1(); - int function2(bool yesno, int number) {} + int functionDeclaredOnly(); + int functionDefinedInClass(bool yesno, int number) {} int functionDefinedOutSideClass(char c); }; @@ -41,8 +41,8 @@ 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); }; @@ -69,8 +69,8 @@ class MyClass { public: MyClass() {} - int function1(); - int function2(bool yesno, int number) {} + int functionDeclaredOnly(); + int functionDefinedInClass(bool yesno, int number) {} int functionDefinedOutSideClass(char c); };