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

Maemo: Create file watchers on demand.

Browse Source 
As QFileSystemWatcher cause some shutdown time.

Rubber-stamped-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-04-14 16:29:00 +02:00
parent b7bb522d5e
commit aa2ea09496
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View File

@@ -79,6 +79,8 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
, m_qemuProcess(new QProcess(this)) , m_qemuProcess(new QProcess(this))
, m_runningQtId(INT_MIN) , m_runningQtId(INT_MIN)
, m_userTerminated(false) , m_userTerminated(false)
, m_runtimeRootWatcher(0)
, m_runtimeFolderWatcher(0)
{ {
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-run.png", iconSize); m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-run.png", iconSize);
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-stop.png", iconSize, m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-stop.png", iconSize,
@@ -124,14 +126,27 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
SLOT(qemuOutput())); SLOT(qemuOutput()));
connect(this, SIGNAL(qemuProcessStatus(QemuStatus, QString)), connect(this, SIGNAL(qemuProcessStatus(QemuStatus, QString)),
this, SLOT(qemuStatusChanged(QemuStatus, QString))); this, SLOT(qemuStatusChanged(QemuStatus, QString)));
}
QFileSystemWatcher *MaemoQemuManager::runtimeRootWatcher()
{
if (!m_runtimeRootWatcher) {
m_runtimeRootWatcher = new QFileSystemWatcher(this); m_runtimeRootWatcher = new QFileSystemWatcher(this);
connect(m_runtimeRootWatcher, SIGNAL(directoryChanged(QString)), this, connect(m_runtimeRootWatcher, SIGNAL(directoryChanged(QString)), this,
SLOT(runtimeRootChanged(QString))); SLOT(runtimeRootChanged(QString)));
}
return m_runtimeRootWatcher;
}
QFileSystemWatcher *MaemoQemuManager::runtimeFolderWatcher()
{
if (!m_runtimeFolderWatcher) {
m_runtimeFolderWatcher = new QFileSystemWatcher(this); m_runtimeFolderWatcher = new QFileSystemWatcher(this);
connect(m_runtimeFolderWatcher, SIGNAL(directoryChanged(QString)), this, connect(m_runtimeFolderWatcher, SIGNAL(directoryChanged(QString)), this,
SLOT(runtimeFolderChanged(QString))); SLOT(runtimeFolderChanged(QString)));
} }
return m_runtimeFolderWatcher;
}
MaemoQemuManager::~MaemoQemuManager() MaemoQemuManager::~MaemoQemuManager()
{ {
@@ -170,8 +185,8 @@ void MaemoQemuManager::qtVersionsChanged(const QList<int> &uniqueIds)
= MaemoQemuRuntimeParser::parseRuntime(version); = MaemoQemuRuntimeParser::parseRuntime(version);
if (runtime.isValid()) { if (runtime.isValid()) {
m_runtimes.insert(uniqueId, runtime); m_runtimes.insert(uniqueId, runtime);
if (!m_runtimeRootWatcher->directories().contains(runtime.m_watchPath)) if (!runtimeRootWatcher()->directories().contains(runtime.m_watchPath))
m_runtimeRootWatcher->addPath(runtime.m_watchPath); runtimeRootWatcher()->addPath(runtime.m_watchPath);
} else { } else {
m_runtimes.remove(uniqueId); m_runtimes.remove(uniqueId);
} }
@@ -462,7 +477,7 @@ void MaemoQemuManager::runtimeRootChanged(const QString &directory)
if (!QFile::exists(runtime.m_root + QLatin1String("/information"))) { if (!QFile::exists(runtime.m_root + QLatin1String("/information"))) {
// install might be still in progress // install might be still in progress
uniqueIds.removeAll(uniqueId); uniqueIds.removeAll(uniqueId);
m_runtimeFolderWatcher->addPath(runtime.m_root); runtimeFolderWatcher()->addPath(runtime.m_root);
} }
} }
} }
@@ -480,6 +495,7 @@ void MaemoQemuManager::runtimeFolderChanged(const QString &directory)
uniqueIds.append(it.key()); uniqueIds.append(it.key());
} }
notify(uniqueIds); notify(uniqueIds);
if (m_runtimeFolderWatcher)
m_runtimeFolderWatcher->removePath(directory); m_runtimeFolderWatcher->removePath(directory);
} }
} }

2
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
View File

@@ -123,6 +123,8 @@ private:
private: private:
QAction *m_qemuAction; QAction *m_qemuAction;
QProcess *m_qemuProcess; QProcess *m_qemuProcess;
QFileSystemWatcher *runtimeRootWatcher();
QFileSystemWatcher *runtimeFolderWatcher();
int m_runningQtId; int m_runningQtId;
bool m_userTerminated; bool m_userTerminated;