comparison mainwindow.h @ 241:4e98950f72e8

* Small simplification to watcher management
author Chris Cannam
date Mon, 10 Jan 2011 15:34:05 +0000
parents 661f5808aa0a
children 8fd71f570884
comparison
equal deleted inserted replaced
240:53ad43d5a463 241:4e98950f72e8
216 QString getEditorBinaryName(); 216 QString getEditorBinaryName();
217 217
218 QFileSystemWatcher *fsWatcher; 218 QFileSystemWatcher *fsWatcher;
219 QTimer *m_fsWatcherGeneralTimer; 219 QTimer *m_fsWatcherGeneralTimer;
220 QTimer *m_fsWatcherRestoreTimer; 220 QTimer *m_fsWatcherRestoreTimer;
221 bool m_fsWatcherSuspended;
221 222
222 QString lastStatOutput; 223 QString lastStatOutput;
223 QStringList lastRevertedFiles; 224 QStringList lastRevertedFiles;
224 225
225 bool justMerged; 226 bool justMerged;