From 0a7aca5a71d10973e97e0aacee719acc13c406fb Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 2 Sep 2021 08:23:46 +0200 Subject: [PATCH] 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 --- src/plugins/cppeditor/CMakeLists.txt | 2 - src/plugins/cppeditor/cppautocompleter.cpp | 4 +- src/plugins/cppeditor/cppdoxygen_test.cpp | 1 - src/plugins/cppeditor/cppeditor.cpp | 51 ------------------- src/plugins/cppeditor/cppeditor.h | 44 ---------------- src/plugins/cppeditor/cppeditor.pro | 2 - src/plugins/cppeditor/cppeditor.qbs | 2 - src/plugins/cppeditor/cppeditorplugin.cpp | 13 +++-- src/plugins/cppeditor/cppeditortestcase.cpp | 11 ++-- src/plugins/cppeditor/cppeditortestcase.h | 12 ++--- src/plugins/cppeditor/cppincludehierarchy.cpp | 7 +-- .../cppeditor/cppincludehierarchy_test.cpp | 4 +- .../cppeditor/cpplocatorfilter_test.cpp | 2 +- src/plugins/cppeditor/cppoutline.cpp | 19 +++---- .../cppeditor/cpppreprocessordialog.cpp | 4 +- src/plugins/cppeditor/cppquickfix_test.cpp | 1 - src/plugins/cppeditor/cppquickfix_test.h | 2 +- src/plugins/cppeditor/cpptoolsreuse.cpp | 15 ++++++ src/plugins/cppeditor/cpptoolsreuse.h | 4 ++ src/plugins/cppeditor/cpptypehierarchy.cpp | 4 +- .../cppeditor/cppuseselections_test.cpp | 3 +- .../cppeditor/fileandtokenactions_test.cpp | 8 +-- .../followsymbol_switchmethoddecldef_test.cpp | 12 ++--- 23 files changed, 73 insertions(+), 154 deletions(-) delete mode 100644 src/plugins/cppeditor/cppeditor.cpp delete mode 100644 src/plugins/cppeditor/cppeditor.h diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt index ae27d8f2ff5..c2d4b1e3dd9 100644 --- a/src/plugins/cppeditor/CMakeLists.txt +++ b/src/plugins/cppeditor/CMakeLists.txt @@ -41,7 +41,6 @@ add_qtc_plugin(CppEditor cppcursorinfo.h cppdocumentationcommenthelper.cpp cppdocumentationcommenthelper.h cppdoxygen.cpp cppdoxygen.h - cppeditor.cpp cppeditor.h cppeditor.qrc cppeditor_global.h cppeditor_utils.h @@ -135,7 +134,6 @@ add_qtc_plugin(CppEditor usages.h wrappablelineedit.cpp wrappablelineedit.h EXPLICIT_MOC - cppeditor.h cppquickfixsettingswidget.h cppquickfixprojectsettingswidget.h ) diff --git a/src/plugins/cppeditor/cppautocompleter.cpp b/src/plugins/cppeditor/cppautocompleter.cpp index b1553a8abf2..7ca95452f3a 100644 --- a/src/plugins/cppeditor/cppautocompleter.cpp +++ b/src/plugins/cppeditor/cppautocompleter.cpp @@ -33,7 +33,6 @@ #include #ifdef WITH_TESTS -#include "cppeditor.h" #include "cppeditorconstants.h" #include "cppeditorplugin.h" #include "cppeditorwidget.h" @@ -41,6 +40,7 @@ #include #include #include +#include #include #include @@ -211,7 +211,7 @@ static QTextCursor openEditor(const QString &text) Core::IEditor *editor = Core::EditorManager::openEditorWithContents( Constants::CPPEDITOR_ID, &name, text.toLocal8Bit()); - Internal::CppEditor *cppEditor = qobject_cast(editor); + const auto cppEditor = qobject_cast(editor); if (cppEditor == 0) return tc; tc = cppEditor->editorWidget()->textCursor(); diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp index b0ae16e6907..78c03686090 100644 --- a/src/plugins/cppeditor/cppdoxygen_test.cpp +++ b/src/plugins/cppeditor/cppdoxygen_test.cpp @@ -25,7 +25,6 @@ #include "cppdoxygen_test.h" -#include "cppeditor.h" #include "cppeditortestcase.h" #include "cppeditorwidget.h" #include "cpptoolssettings.h" diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp deleted file mode 100644 index 1327d4cc2db..00000000000 --- a/src/plugins/cppeditor/cppeditor.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "cppeditor.h" -#include "cppautocompleter.h" -#include "cpphighlighter.h" -#include "cppqtstyleindenter.h" - -#include -#include - -namespace CppEditor { -namespace Internal { - -CppEditor::CppEditor() -{ - addContext(ProjectExplorer::Constants::CXX_LANGUAGE_ID); -} - -void CppEditor::decorateEditor(TextEditor::TextEditorWidget *editor) -{ - editor->textDocument()->setSyntaxHighlighter(new CppHighlighter); - editor->textDocument()->setIndenter( - new CppQtStyleIndenter(editor->textDocument()->document())); - editor->setAutoCompleter(new CppAutoCompleter); -} - -} // namespace Internal -} // namespace CppEditor diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h deleted file mode 100644 index fdc19cb6c30..00000000000 --- a/src/plugins/cppeditor/cppeditor.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include - -namespace CppEditor { -namespace Internal { - -class CppEditor : public TextEditor::BaseTextEditor -{ - Q_OBJECT - -public: - CppEditor(); - - static void decorateEditor(TextEditor::TextEditorWidget *editor); -}; - -} // namespace Internal -} // namespace CppEditor diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 636d9d8089a..24c62083557 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -38,7 +38,6 @@ HEADERS += \ cppcursorinfo.h \ cppdocumentationcommenthelper.h \ cppdoxygen.h \ - cppeditor.h \ cppeditor_global.h \ cppeditor_utils.h \ cppeditorconstants.h \ @@ -163,7 +162,6 @@ SOURCES += \ cppcurrentdocumentfilter.cpp \ cppdocumentationcommenthelper.cpp \ cppdoxygen.cpp \ - cppeditor.cpp \ cppeditordocument.cpp \ cppeditoroutline.cpp \ cppeditorplugin.cpp \ diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 9d18d41caa8..571b82a07f8 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -101,8 +101,6 @@ QtcPlugin { "cppdoxygen.cpp", "cppdoxygen.h", "cppdoxygen.kwgen", - "cppeditor.cpp", - "cppeditor.h", "cppeditorwidget.cpp", "cppeditorwidget.h", "cppeditor.qrc", diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 59d654f3f52..d9dcf5dccf0 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -30,7 +30,6 @@ #include "cppcodemodelsettings.h" #include "cppcodemodelsettingspage.h" #include "cppcodestylesettingspage.h" -#include "cppeditor.h" #include "cppeditorconstants.h" #include "cppeditordocument.h" #include "cppeditorwidget.h" @@ -97,11 +96,13 @@ #include #include +#include #include #include #include #include +#include #include #include @@ -158,7 +159,11 @@ public: setDocumentCreator([]() { return new CppEditorDocument; }); setEditorWidgetCreator([]() { return new CppEditorWidget; }); - setEditorCreator([]() { return new CppEditor; }); + setEditorCreator([]() { + const auto editor = new BaseTextEditor; + editor->addContext(ProjectExplorer::Constants::CXX_LANGUAGE_ID); + return editor; + }); setAutoCompleterCreator([]() { return new CppAutoCompleter; }); setCommentDefinition(CommentDefinition::CppStyle); setCodeFoldingSupported(true); @@ -313,7 +318,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err ProjectPanelFactory::registerFactory(quickFixSettingsPanelFactory); SnippetProvider::registerGroup(Constants::CPP_SNIPPETS_GROUP_ID, tr("C++", "SnippetProvider"), - &CppEditor::decorateEditor); + &decorateCppEditor); createCppQuickFixes(); @@ -621,7 +626,7 @@ CppFileSettings *CppEditorPlugin::fileSettings() void CppEditorPlugin::switchHeaderSource() { - ::CppEditor::switchHeaderSource(); + CppEditor::switchHeaderSource(); } void CppEditorPlugin::switchHeaderSourceInNextSplit() diff --git a/src/plugins/cppeditor/cppeditortestcase.cpp b/src/plugins/cppeditor/cppeditortestcase.cpp index 52199a13040..a327ed329b0 100644 --- a/src/plugins/cppeditor/cppeditortestcase.cpp +++ b/src/plugins/cppeditor/cppeditortestcase.cpp @@ -26,7 +26,6 @@ #include "cppeditortestcase.h" #include "cppcodemodelsettings.h" -#include "cppeditor.h" #include "cppeditorwidget.h" #include "cppeditordocument.h" #include "cppeditorplugin.h" @@ -36,6 +35,7 @@ #include #include #include +#include #include @@ -49,7 +49,7 @@ namespace Tests { GenericCppTestDocument::GenericCppTestDocument(const QByteArray &fileName, const QByteArray &source, char cursorMarker) - : ::CppEditor::Tests::BaseCppTestDocument(fileName, source, cursorMarker) + : CppEditor::Tests::BaseCppTestDocument(fileName, source, cursorMarker) , m_cursorPosition(-1) , m_anchorPosition(-1) , m_selectionStartMarker(QLatin1Char(m_cursorMarker) + QLatin1String("{start}")) @@ -78,13 +78,14 @@ bool GenericCppTestDocument::hasCursorMarker() const { return m_cursorPosition ! bool GenericCppTestDocument::hasAnchorMarker() const { return m_anchorPosition != -1; } -TestCase::TestCase(bool runGarbageCollector) : ::CppEditor::Tests::TestCase(runGarbageCollector) +TestCase::TestCase(bool runGarbageCollector) : CppEditor::Tests::TestCase(runGarbageCollector) { } -bool TestCase::openCppEditor(const QString &fileName, CppEditor **editor, CppEditorWidget **editorWidget) +bool TestCase::openCppEditor(const QString &fileName, TextEditor::BaseTextEditor **editor, + CppEditorWidget **editorWidget) { - if (CppEditor *e = dynamic_cast(Core::EditorManager::openEditor(fileName))) { + if (const auto e = dynamic_cast(Core::EditorManager::openEditor(fileName))) { if (editor) { *editor = e; TextEditor::StorageSettings s = e->textDocument()->storageSettings(); diff --git a/src/plugins/cppeditor/cppeditortestcase.h b/src/plugins/cppeditor/cppeditortestcase.h index e75f5a1b886..7dd819694df 100644 --- a/src/plugins/cppeditor/cppeditortestcase.h +++ b/src/plugins/cppeditor/cppeditortestcase.h @@ -29,15 +29,15 @@ #include +namespace TextEditor { class BaseTextEditor; } + namespace CppEditor { namespace Internal { - -class CppEditor; class CppEditorWidget; namespace Tests { -class GenericCppTestDocument : public ::CppEditor::Tests::BaseCppTestDocument +class GenericCppTestDocument : public CppEditor::Tests::BaseCppTestDocument { public: GenericCppTestDocument(const QByteArray &fileName, const QByteArray &source, @@ -51,19 +51,19 @@ public: int m_anchorPosition; QString m_selectionStartMarker; QString m_selectionEndMarker; - CppEditor *m_editor; + TextEditor::BaseTextEditor *m_editor; CppEditorWidget *m_editorWidget; }; using TestDocuments = QVector; -class TestCase : public ::CppEditor::Tests::TestCase +class TestCase : public CppEditor::Tests::TestCase { public: TestCase(bool runGarbageCollector = true); static bool openCppEditor(const QString &fileName, - CppEditor **editor, + TextEditor::BaseTextEditor **editor, CppEditorWidget **editorWidget = 0); static CPlusPlus::Document::Ptr waitForRehighlightedSemanticDocument( diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp index ecb3c1b0a65..6a711709ce5 100644 --- a/src/plugins/cppeditor/cppincludehierarchy.cpp +++ b/src/plugins/cppeditor/cppincludehierarchy.cpp @@ -26,7 +26,6 @@ #include "cppincludehierarchy.h" #include "baseeditordocumentprocessor.h" -#include "cppeditor.h" #include "editordocumenthandle.h" #include "cppeditorwidget.h" #include "cppeditorconstants.h" @@ -42,6 +41,8 @@ #include +#include + #include #include #include @@ -428,7 +429,7 @@ void CppIncludeHierarchyWidget::perform() { showNoIncludeHierarchyLabel(); - m_editor = qobject_cast(EditorManager::currentEditor()); + m_editor = qobject_cast(EditorManager::currentEditor()); if (!m_editor) return; @@ -493,7 +494,7 @@ void CppIncludeHierarchyWidget::syncFromEditorManager() if (!m_toggleSync->isChecked()) return; - auto editor = qobject_cast(EditorManager::currentEditor()); + const auto editor = qobject_cast(EditorManager::currentEditor()); if (!editor) return; diff --git a/src/plugins/cppeditor/cppincludehierarchy_test.cpp b/src/plugins/cppeditor/cppincludehierarchy_test.cpp index ae94a808e4e..b66cf5ae2dd 100644 --- a/src/plugins/cppeditor/cppincludehierarchy_test.cpp +++ b/src/plugins/cppeditor/cppincludehierarchy_test.cpp @@ -25,13 +25,13 @@ #include "cppincludehierarchy_test.h" -#include "cppeditor.h" #include "cppeditorwidget.h" #include "cppeditortestcase.h" #include "cppincludehierarchy.h" #include "cppmodelmanager.h" #include +#include #include #include @@ -95,7 +95,7 @@ public: // Open Editor const QString fileName = temporaryDir.path() + QLatin1String("/file1.h"); - CppEditor *editor; + TextEditor::BaseTextEditor *editor; QVERIFY(openCppEditor(fileName, &editor)); closeEditorAtEndOfTestCase(editor); diff --git a/src/plugins/cppeditor/cpplocatorfilter_test.cpp b/src/plugins/cppeditor/cpplocatorfilter_test.cpp index b12ec55a2b6..99798e33b1b 100644 --- a/src/plugins/cppeditor/cpplocatorfilter_test.cpp +++ b/src/plugins/cppeditor/cpplocatorfilter_test.cpp @@ -56,7 +56,7 @@ QTC_DECLARE_MYTESTDATADIR("../../../tests/cpplocators/") class CppLocatorFilterTestCase : public BasicLocatorFilterTest - , public ::CppEditor::Tests::TestCase + , public CppEditor::Tests::TestCase { public: CppLocatorFilterTestCase(ILocatorFilter *filter, diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index 02f08ee45c5..272cea574a0 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/src/plugins/cppeditor/cppoutline.cpp @@ -25,16 +25,14 @@ #include "cppoutline.h" -#include "cppeditor.h" #include "cppeditoroutline.h" #include "cppmodelmanager.h" #include "cppoverviewmodel.h" -#include - #include #include - +#include +#include #include #include @@ -212,21 +210,20 @@ bool CppOutlineWidget::syncCursor() bool CppOutlineWidgetFactory::supportsEditor(Core::IEditor *editor) const { - const auto cppEditor = qobject_cast(editor); - if (!cppEditor) + const auto cppEditor = qobject_cast(editor); + if (!cppEditor || !CppModelManager::isCppEditor(cppEditor)) return false; return CppModelManager::supportsOutline(cppEditor->textDocument()); } TextEditor::IOutlineWidget *CppOutlineWidgetFactory::createWidget(Core::IEditor *editor) { - auto *cppEditor = qobject_cast(editor); - auto *cppEditorWidget = qobject_cast(cppEditor->widget()); + const auto cppEditor = qobject_cast(editor); + QTC_ASSERT(cppEditor, return nullptr); + const auto cppEditorWidget = qobject_cast(cppEditor->widget()); QTC_ASSERT(cppEditorWidget, return nullptr); - auto *widget = new CppOutlineWidget(cppEditorWidget); - - return widget; + return new CppOutlineWidget(cppEditorWidget); } } // namespace Internal diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index 03b01a05b27..c1a181d0dfd 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -26,9 +26,9 @@ #include "cpppreprocessordialog.h" #include "ui_cpppreprocessordialog.h" -#include "cppeditor.h" #include "cppeditorwidget.h" #include "cppeditorconstants.h" +#include "cpptoolsreuse.h" #include @@ -43,7 +43,7 @@ CppPreProcessorDialog::CppPreProcessorDialog(const QString &filePath, QWidget *p m_ui->editorLabel->setText(m_ui->editorLabel->text().arg(Utils::FilePath::fromString(m_filePath).fileName())); m_ui->editWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - CppEditor::decorateEditor(m_ui->editWidget); + decorateCppEditor(m_ui->editWidget); const QString key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + m_filePath; const QString directives = ProjectExplorer::SessionManager::value(key).toString(); diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index df953f2d93d..5695524a023 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -26,7 +26,6 @@ #include "cppquickfix_test.h" #include "cppcodestylepreferences.h" -#include "cppeditor.h" #include "cppeditorplugin.h" #include "cppeditortestcase.h" #include "cppeditorwidget.h" diff --git a/src/plugins/cppeditor/cppquickfix_test.h b/src/plugins/cppeditor/cppquickfix_test.h index 0dc52c0881b..9347be1a985 100644 --- a/src/plugins/cppeditor/cppquickfix_test.h +++ b/src/plugins/cppeditor/cppquickfix_test.h @@ -85,7 +85,7 @@ protected: QList m_testDocuments; private: - QScopedPointer<::CppEditor::Tests::TemporaryDir> m_temporaryDirectory; + QScopedPointer m_temporaryDirectory; CppCodeStylePreferences *m_cppCodeStylePreferences; QByteArray m_cppCodeStylePreferencesOriginalDelegateId; diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp index f1927cf5a04..15a1bea88a1 100644 --- a/src/plugins/cppeditor/cpptoolsreuse.cpp +++ b/src/plugins/cppeditor/cpptoolsreuse.cpp @@ -25,9 +25,12 @@ #include "cpptoolsreuse.h" +#include "cppautocompleter.h" #include "cppcodemodelsettings.h" #include "cppeditorconstants.h" #include "cppeditorplugin.h" +#include "cpphighlighter.h" +#include "cppqtstyleindenter.h" #include "cpprefactoringchanges.h" #include "projectinfo.h" @@ -36,6 +39,7 @@ #include #include #include +#include #include #include @@ -584,4 +588,15 @@ ProjectExplorer::Project *projectForProjectInfo(const ProjectInfo &info) return ProjectExplorer::SessionManager::projectWithProjectFilePath(info.projectFilePath()); } +namespace Internal { + +void decorateCppEditor(TextEditor::TextEditorWidget *editor) +{ + editor->textDocument()->setSyntaxHighlighter(new CppHighlighter); + editor->textDocument()->setIndenter( + new CppQtStyleIndenter(editor->textDocument()->document())); + editor->setAutoCompleter(new CppAutoCompleter); +} + +} // namespace Internal } // CppEditor diff --git a/src/plugins/cppeditor/cpptoolsreuse.h b/src/plugins/cppeditor/cpptoolsreuse.h index 1b749f048f3..e9055b78b9f 100644 --- a/src/plugins/cppeditor/cpptoolsreuse.h +++ b/src/plugins/cppeditor/cpptoolsreuse.h @@ -154,4 +154,8 @@ private: bool m_done = false; }; +namespace Internal { +void decorateCppEditor(TextEditor::TextEditorWidget *editor); +} // namespace Internal + } // CppEditor diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 0baf2ff5ba6..d8b627946a2 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/src/plugins/cppeditor/cpptypehierarchy.cpp @@ -26,7 +26,6 @@ #include "cpptypehierarchy.h" #include "cppeditorconstants.h" -#include "cppeditor.h" #include "cppeditorwidget.h" #include "cppeditorplugin.h" #include "cppelementevaluator.h" @@ -34,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -188,7 +188,7 @@ void CppTypeHierarchyWidget::perform() m_showOldClass = false; - auto editor = qobject_cast(Core::EditorManager::currentEditor()); + auto editor = qobject_cast(Core::EditorManager::currentEditor()); if (!editor) { showNoTypeHierarchyLabel(); return; diff --git a/src/plugins/cppeditor/cppuseselections_test.cpp b/src/plugins/cppeditor/cppuseselections_test.cpp index 4b8643bfa01..48a826243d4 100644 --- a/src/plugins/cppeditor/cppuseselections_test.cpp +++ b/src/plugins/cppeditor/cppuseselections_test.cpp @@ -25,7 +25,6 @@ #include "cppuseselections_test.h" -#include "cppeditor.h" #include "cppeditorwidget.h" #include "cppeditortestcase.h" #include "cppmodelmanager.h" @@ -89,7 +88,7 @@ UseSelectionsTestCase::UseSelectionsTestCase(GenericCppTestDocument &testFile, QVERIFY(testFile.hasCursorMarker()); testFile.m_source.remove(testFile.m_cursorPosition, 1); - ::CppEditor::Tests::TemporaryDir temporaryDir; + CppEditor::Tests::TemporaryDir temporaryDir; QVERIFY(temporaryDir.isValid()); testFile.setBaseDirectory(temporaryDir.path()); testFile.writeToDisk(); diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index c864b24fdef..e32ab937183 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -25,7 +25,6 @@ #include "fileandtokenactions_test.h" -#include "cppeditor.h" #include "cppeditorplugin.h" #include "cppeditortestcase.h" #include "cppeditorwidget.h" @@ -42,6 +41,7 @@ #include #include #include +#include #include #include @@ -111,7 +111,7 @@ private: /// Move word camel case wise from current cursor position until given token (not included) /// and execute the tokenActions for each new position. static void moveWordCamelCaseToToken(TranslationUnit *translationUnit, const Token &token, - CppEditor *editor, const Actions &tokenActions); + BaseTextEditor *editor, const Actions &tokenActions); static void undoAllChangesAndCloseAllEditors(); }; @@ -176,7 +176,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti // Open editor QCOMPARE(DocumentModel::openedDocuments().size(), 0); - CppEditor *editor; + BaseTextEditor *editor; CppEditorWidget *editorWidget; QVERIFY(openCppEditor(filePath, &editor, &editorWidget)); @@ -276,7 +276,7 @@ void TestActionsTestCase::executeActionsOnEditorWidget(CppEditorWidget *editorWi void TestActionsTestCase::moveWordCamelCaseToToken(TranslationUnit *translationUnit, const Token &token, - CppEditor *editor, + BaseTextEditor *editor, const Actions &tokenActions) { QVERIFY(translationUnit); diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index f005848b83b..4a94df6603f 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 #include #include +#include #include #include @@ -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;