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

QmlPropjectManager: Fix ownership

Browse Source 
Explicit ownership has the advatage that you can see if you leak memory.
Removed overused casting too.

Change-Id: I2336aa07525742d6c1415471ea15ed101406a90c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2022-08-24 15:39:21 +02:00
committed by Thomas Hartmann
parent fe5848a47c
commit 84e3ffeaba
4 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
View File

@@ -40,13 +40,12 @@ void QmlProjectItem::setSourceDirectory(const QString &directoryPath)
m_sourceDirectory = directoryPath;
for (auto contentElement : qAsConst(m_content)) {
auto fileFilter = qobject_cast<FileFilterBaseItem*>(contentElement);
if (fileFilter) {
fileFilter->setDefaultDirectory(directoryPath);
connect(fileFilter, &FileFilterBaseItem::filesChanged,
this, &QmlProjectItem::qmlFilesChanged);
}
for (auto &fileFilter : m_content) {
fileFilter->setDefaultDirectory(directoryPath);
connect(fileFilter.get(),
&FileFilterBaseItem::filesChanged,
this,
&QmlProjectItem::qmlFilesChanged);
}
}
@@ -99,12 +98,10 @@ QStringList QmlProjectItem::files() const
{
QSet<QString> files;
for (const auto contentElement : qAsConst(m_content)) {
if (auto fileFilter = qobject_cast<const FileFilterBaseItem *>(contentElement)) {
const QStringList fileList = fileFilter->files();
for (const QString &file : fileList) {
files.insert(file);
}
for (const auto &fileFilter : m_content) {
const QStringList fileList = fileFilter->files();
for (const QString &file : fileList) {
files.insert(file);
}
}
return Utils::toList(files);
@@ -118,9 +115,8 @@ QStringList QmlProjectItem::files() const
*/
bool QmlProjectItem::matchesFile(const QString &filePath) const
{
return Utils::contains(m_content, [&filePath](const QmlProjectContentItem *item) {
auto fileFilter = qobject_cast<const FileFilterBaseItem *>(item);
return fileFilter && fileFilter->matchesFile(filePath);
return Utils::contains(m_content, [&filePath](const auto &fileFilter) {
return fileFilter->matchesFile(filePath);
});
}