diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-02 08:23:46 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-03 11:10:26 +0000 |
| commit | 0a7aca5a71d10973e97e0aacee719acc13c406fb (patch) | |
| tree | 6b6d2961f5d6263c5d595b1b2fac556509aa1271 /src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | |
| parent | f7aa963a072724f35dea4788cd5f473a91288bdd (diff) | |
CppEditor: Remove class CppEditor
It's not needed, and conflicts with the namespace of the same name in
some contexts.
Change-Id: I281025abbfad0feb602f006e3b997a8b9c308b48
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp')
| -rw-r--r-- | src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index f005848b83..4a94df6603 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -26,7 +26,6 @@ #include "followsymbol_switchmethoddecldef_test.h" #include "cppcodemodelsettings.h" -#include "cppeditor.h" #include "cppeditorplugin.h" #include "cppeditortestcase.h" #include "cppeditorwidget.h" @@ -44,6 +43,7 @@ #include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/codeassist/iassistprocessor.h> #include <texteditor/codeassist/iassistproposal.h> +#include <texteditor/texteditor.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/idocument.h> @@ -317,7 +317,7 @@ F2TestCase::F2TestCase(CppEditorAction action, } // Write files to disk - ::CppEditor::Tests::TemporaryDir temporaryDir; + CppEditor::Tests::TemporaryDir temporaryDir; QVERIFY(temporaryDir.isValid()); QString projectFileContent = "CppApplication { files: ["; foreach (TestDocumentPtr testFile, testFiles) { @@ -349,8 +349,8 @@ F2TestCase::F2TestCase(CppEditorAction action, openProjectResult.project()->configureAsExampleProject(m_testKit); // Wait until project is fully indexed. - QVERIFY(::CppEditor::Tests::waitForSignalOrTimeout(openProjectResult.project(), - &Project::indexingFinished, ::CppEditor::Tests::clangdIndexingTimeout())); + QVERIFY(CppEditor::Tests::waitForSignalOrTimeout(openProjectResult.project(), + &Project::indexingFinished, CppEditor::Tests::clangdIndexingTimeout())); } // Update Code Model @@ -441,8 +441,8 @@ F2TestCase::F2TestCase(CppEditorAction action, QEXPECT_FAIL("infiniteLoopLocalTypedef_QTCREATORBUG-11999", "clangd bug: Go to definition does not return", Abort); if (expectedVirtualFunctionProposal.size() <= 1) { - QVERIFY(::CppEditor::Tests::waitForSignalOrTimeout(EditorManager::instance(), - &EditorManager::linkOpened, 10000)); + QVERIFY(CppEditor::Tests::waitForSignalOrTimeout(EditorManager::instance(), + &EditorManager::linkOpened, 10000)); } else { QTimer t; QEventLoop l; |