diff options
Diffstat (limited to 'src/plugins/qmlprojectmanager')
-rw-r--r-- | src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp | 9 | ||||
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index 9f0a16a921..988c51dbfe 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -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 diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index ecfe48378b..114676b315 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -275,7 +275,7 @@ void QmlProject::refreshFiles(const QSet<QString> &/*added*/, const QSet<QString refresh(Files); if (!removed.isEmpty()) { if (auto modelManager = QmlJS::ModelManagerInterface::instance()) - modelManager->removeFiles(removed.toList()); + modelManager->removeFiles(Utils::toList(removed)); } refreshTargetDirectory(); } |