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

More Utils::toSet/toList

Browse Source 
... and unrelated cosmetic changes.

Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-07-03 18:34:30 +02:00
parent 599b03179e
commit 6a58666f44
49 changed files with 138 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
View File

@@ -25,6 +25,7 @@
#include "filefilteritems.h"
#include <utils/algorithm.h>
#include <utils/filesystemwatcher.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
@@ -160,7 +161,7 @@ void FileFilterBaseItem::setPathsProperty(const QStringList &path)
QStringList FileFilterBaseItem::files() const
{
return m_files.toList();
return Utils::toList(m_files);
}
/**
@@ -243,16 +244,16 @@ void FileFilterBaseItem::updateFileListNow()
}
// update watched directories
const QSet<QString> oldDirs = watchedDirectories().toSet();
const QSet<QString> oldDirs = Utils::toSet(watchedDirectories());
const QSet<QString> unwatchDirs = oldDirs - dirsToBeWatched;
const QSet<QString> watchDirs = dirsToBeWatched - oldDirs;
if (!unwatchDirs.isEmpty()) {
QTC_ASSERT(m_dirWatcher, return);
m_dirWatcher->removeDirectories(unwatchDirs.toList());
m_dirWatcher->removeDirectories(Utils::toList(unwatchDirs));
}
if (!watchDirs.isEmpty())
dirWatcher()->addDirectories(watchDirs.toList(), Utils::FileSystemWatcher::WatchAllChanges);
dirWatcher()->addDirectories(Utils::toList(watchDirs), Utils::FileSystemWatcher::WatchAllChanges);
}
bool FileFilterBaseItem::fileMatches(const QString &fileName) const