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

Utils: Introduce FileSystemWatcher.

Browse Source 
Remove duplicated classes ProjectExplorer::FileWatcher
and QmlProjectManager::FileSystemWatcher, create
Utils::FileSystemWatcher from them, merging the functionality.

Also use in HelpManager/Maemo, reducing the number
of QFileSystemWatcher instances (and thus, shutdown time).
This commit is contained in:
Friedemann Kleint
2011-04-15 15:55:11 +02:00
parent 72ae03ba80
commit f5cbf87965
19 changed files with 532 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -32,13 +32,13 @@
#include "helpmanager.h"
#include "icore.h"
#include <coreplugin/icore.h>
#include <utils/filesystemwatcher.h>
#include <QtCore/QDateTime>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QFileSystemWatcher>
#include <QtCore/QStringList>
#include <QtHelp/QHelpEngineCore>
@@ -58,7 +58,7 @@ struct HelpManagerPrivate {
bool m_needsSetup;
QHelpEngineCore *m_helpEngine;
QFileSystemWatcher *m_collectionWatcher;
Utils::FileSystemWatcher *m_collectionWatcher;
QStringList m_filesToRegister;
QStringList m_nameSpacesToUnregister;
@@ -429,8 +429,9 @@ void HelpManager::setupHelpManager()
for (it = d->m_customValues.constBegin(); it != d->m_customValues.constEnd(); ++it)
setCustomValue(it.key(), it.value());
d->m_collectionWatcher = new QFileSystemWatcher(QStringList() << collectionFilePath(),
this);
d->m_collectionWatcher = new Utils::FileSystemWatcher(this);
d->m_collectionWatcher->setObjectName(QLatin1String("HelpCollectionWatcher"));
d->m_collectionWatcher->addFile(collectionFilePath(), Utils::FileSystemWatcher::WatchAllChanges);
connect(d->m_collectionWatcher, SIGNAL(fileChanged(QString)), this,
SLOT(collectionFileModified()));