comparison mainwindow.h @ 239:661f5808aa0a

* Overhaul settings-defaults mechanism, and add Restore Defaults button to settings dialog
author Chris Cannam
date Mon, 10 Jan 2011 15:18:21 +0000
parents e2f2c6e3c01b
children 4e98950f72e8
comparison
equal deleted inserted replaced
238:e2f2c6e3c01b 239:661f5808aa0a
209 209
210 HgRunner *runner; 210 HgRunner *runner;
211 211
212 bool shouldHgStat; 212 bool shouldHgStat;
213 213
214 QString findDiffBinaryName(); 214 QString getDiffBinaryName();
215 QString findMergeBinaryName(); 215 QString getMergeBinaryName();
216 QString findEditorBinaryName(); 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 221