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

QmlDesigner: Replace filewatcher in resource model

Browse Source 
Replace the Utils::FileWatcher with a connection to the ProjectExplorer
fileListChanged signal.

Change-Id: Ia2d3a6d239451ed979bbfb654fe5258aadd3c686
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2021-12-14 17:46:33 +01:00
committed by Henning Gründl
parent 4617023e16
commit 117a8c65b9
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
View File

@@ -36,15 +36,22 @@
#include <QDirIterator> #include <QDirIterator>
#include <qmlmodelnodeproxy.h> #include <qmlmodelnodeproxy.h>
#include <projectexplorer/project.h>
#include <projectexplorer/session.h>
static QString s_lastBrowserPath; static QString s_lastBrowserPath;
FileResourcesModel::FileResourcesModel(QObject *parent) FileResourcesModel::FileResourcesModel(QObject *parent)
: QObject(parent) : QObject(parent)
, m_filter(QLatin1String("(*.*)")) , m_filter(QLatin1String("(*.*)"))
, m_fileSystemWatcher(new Utils::FileSystemWatcher(this))
{ {
connect(m_fileSystemWatcher, &Utils::FileSystemWatcher::directoryChanged, ProjectExplorer::Project *project = ProjectExplorer::SessionManager::projectForFile(
QmlDesigner::DocumentManager::currentFilePath());
if (project) {
connect(project, &ProjectExplorer::Project::fileListChanged,
this, &FileResourcesModel::refreshModel); this, &FileResourcesModel::refreshModel);
}
} }
void FileResourcesModel::setModelNodeBackend(const QVariant &modelNodeBackend) void FileResourcesModel::setModelNodeBackend(const QVariant &modelNodeBackend)
@@ -195,12 +202,7 @@ bool filterMetaIcons(const QString &fileName)
void FileResourcesModel::setupModel() void FileResourcesModel::setupModel()
{ {
m_dirPath = QDir(m_path.toLocalFile()); m_dirPath = QDir(m_path.toLocalFile());
refreshModel(); refreshModel();
m_fileSystemWatcher->removeDirectories(m_fileSystemWatcher->directories());
m_fileSystemWatcher->addDirectory(m_dirPath.absolutePath(),
Utils::FileSystemWatcher::WatchAllChanges);
} }
void FileResourcesModel::refreshModel() void FileResourcesModel::refreshModel()

3
src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h
View File

@@ -27,8 +27,6 @@
#include <qmlitemnode.h> #include <qmlitemnode.h>
#include <utils/filesystemwatcher.h>
#include <QDir> #include <QDir>
#include <QObject> #include <QObject>
#include <QStringList> #include <QStringList>
@@ -87,7 +85,6 @@ private:
QString m_lastResourcePath; QString m_lastResourcePath;
QStringList m_fullPathModel; QStringList m_fullPathModel;
QStringList m_fileNameModel; QStringList m_fileNameModel;
Utils::FileSystemWatcher *m_fileSystemWatcher;
}; };
QML_DECLARE_TYPE(FileResourcesModel) QML_DECLARE_TYPE(FileResourcesModel)