summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cppeditor/cppeditorplugin.cpp2
-rw-r--r--src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp14
-rw-r--r--src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.h6
3 files changed, 8 insertions, 14 deletions
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index d325766666..041f2ca3be 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -402,10 +402,10 @@ QVector<QObject *> CppEditorPlugin::createTestObjects() const
{
return {
#ifdef WITH_TESTS
- new FollowSymbolTest,
new Tests::AutoCompleterTest,
new Tests::DoxygenTest,
new Tests::FileAndTokenActionsTest,
+ new Tests::FollowSymbolTest,
new Tests::IncludeHierarchyTest,
new Tests::InsertVirtualMethodsTest,
new Tests::QuickfixTest,
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index fd25211090..10c78edc8a 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -123,8 +123,7 @@ QT_END_NAMESPACE
typedef QByteArray _;
-namespace CppEditor {
-namespace Internal {
+namespace CppEditor::Internal::Tests {
/// A fake virtual functions assist provider that runs processor->perform() already in configure()
class VirtualFunctionTestAssistProvider : public VirtualFunctionAssistProvider
@@ -546,13 +545,11 @@ TestDocumentPtr F2TestCase::testFileWithTargetCursorMarker(const QList<TestDocum
return TestDocumentPtr();
}
-} // namespace Internal
-} // namespace CppEditor
+} // namespace CppEditor::Internal::Tests
-Q_DECLARE_METATYPE(QList<CppEditor::Internal::TestDocumentPtr>)
+Q_DECLARE_METATYPE(QList<CppEditor::Internal::Tests::TestDocumentPtr>)
-namespace CppEditor {
-namespace Internal {
+namespace CppEditor::Internal::Tests {
void FollowSymbolTest::initTestCase()
{
@@ -2080,8 +2077,7 @@ void FollowSymbolTest::testFollowVirtualFunctionCallMultipleDocuments()
F2TestCase(F2TestCase::FollowSymbolUnderCursorAction, testFiles, finalResults);
}
-} // namespace Internal
-} // namespace CppEditor
+} // namespace CppEditor::Internal::Tests
/*
Potential test cases improving name lookup.
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.h b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.h
index 0fec2d8751..ce34d8a1ab 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.h
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.h
@@ -27,9 +27,7 @@
#include <QObject>
-// Can't use Tests namespace because someone had the clever idea to create two
-// non-local TestDocument classes in this plugin.
-namespace CppEditor::Internal {
+namespace CppEditor::Internal::Tests {
class FollowSymbolTest : public QObject
{
@@ -71,4 +69,4 @@ private slots:
void testFollowVirtualFunctionCallMultipleDocuments();
};
-} // namespace CppEditor::Internal
+} // namespace CppEditor::Internal::Tests