feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Remove Snapshot::remove(QString) overload

Browse Source 
... and fix fallout.

Change-Id: Ibbf865c3e4158fc98bb9b5372ce0633807b85576
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-11-23 18:29:50 +01:00
parent 3694d00dce
commit 03a91f9f98
16 changed files with 53 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cppeditor/fileandtokenactions_test.cpp
View File

@@ -130,7 +130,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
QVERIFY(waitUntilAProjectIsLoaded());
// Collect files to process
QStringList filesToOpen;
FilePaths filesToOpen;
QList<QPointer<ProjectExplorer::Project> > projects;
const QList<ProjectInfo::ConstPtr> projectInfos = m_modelManager->projectInfos();
@@ -139,15 +139,15 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
<< info->sourceFiles().size();
const QSet<QString> sourceFiles = info->sourceFiles();
for (const QString &sourceFile : sourceFiles)
filesToOpen << sourceFile;
filesToOpen << FilePath::fromString(sourceFile);
}
Utils::sort(filesToOpen);
// Process all files from the projects
for (const QString &filePath : std::as_const(filesToOpen)) {
for (const FilePath &filePath : std::as_const(filesToOpen)) {
// Skip e.g. "<configuration>"
if (!QFileInfo::exists(filePath))
if (!filePath.exists())
continue;
qDebug() << " --" << filePath;
@@ -159,7 +159,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
QCOMPARE(DocumentModel::openedDocuments().size(), 0);
BaseTextEditor *editor;
CppEditorWidget *editorWidget;
QVERIFY(openCppEditor(FilePath::fromString(filePath), &editor, &editorWidget));
QVERIFY(openCppEditor(filePath, &editor, &editorWidget));
QCOMPARE(DocumentModel::openedDocuments().size(), 1);
QVERIFY(m_modelManager->isCppEditor(editor));
@@ -176,7 +176,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
const Snapshot snapshot = globalSnapshot();
Document::Ptr document = snapshot.preprocessedDocument(
editorWidget->document()->toPlainText().toUtf8(), Utils::FilePath::fromString(filePath));
editorWidget->document()->toPlainText().toUtf8(), filePath);
QVERIFY(document);
document->parse();
TranslationUnit *translationUnit = document->translationUnit();