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

qmljs: (QString -> Utils::FilePath)++

Browse Source 
convert more QString containing paths to Utils::FilePath

Change-Id: I1219d7d147993e48cfa641dc9bea72ab38c90f51
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Fawzi Mohamed
2022-06-20 12:35:13 +02:00
committed by Tim Jenssen
parent 0bb272d411
commit fd89043de2
79 changed files with 844 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmljstools/qmljslocatordata.cpp
View File

@@ -47,13 +47,15 @@ LocatorData::LocatorData()
// Force the updating of source file when updating a project (they could be cached, in such
// case LocatorData::onDocumentUpdated will not be called.
connect(manager, &ModelManagerInterface::projectInfoUpdated,
connect(manager,
&ModelManagerInterface::projectInfoUpdated,
[manager](const ModelManagerInterface::ProjectInfo &info) {
QStringList files;
for (const Utils::FilePath &f: info.project->files(ProjectExplorer::Project::SourceFiles))
files << f.toString();
manager->updateSourceFiles(files, true);
});
Utils::FilePaths files;
for (const Utils::FilePath &f :
info.project->files(ProjectExplorer::Project::SourceFiles))
files << f;
manager->updateSourceFiles(files, true);
});
connect(manager, &ModelManagerInterface::documentUpdated,
this, &LocatorData::onDocumentUpdated);
@@ -86,7 +88,7 @@ public:
if (!doc->componentName().isEmpty())
m_documentContext = doc->componentName();
else
m_documentContext = Utils::FilePath::fromString(doc->fileName()).fileName();
m_documentContext = doc->fileName().fileName();
accept(doc->ast(), m_documentContext);
return m_entries;
}
@@ -236,7 +238,7 @@ protected:
};
} // anonymous namespace
QHash<QString, QList<LocatorData::Entry> > LocatorData::entries() const
QHash<Utils::FilePath, QList<LocatorData::Entry>> LocatorData::entries() const
{
QMutexLocker l(&m_mutex);
return m_entries;
@@ -249,10 +251,10 @@ void LocatorData::onDocumentUpdated(const Document::Ptr &doc)
m_entries.insert(doc->fileName(), entries);
}
void LocatorData::onAboutToRemoveFiles(const QStringList &files)
void LocatorData::onAboutToRemoveFiles(const Utils::FilePaths &files)
{
QMutexLocker l(&m_mutex);
for (const QString &file : files) {
for (const Utils::FilePath &file : files) {
m_entries.remove(file);
}
}