diff 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
line wrap: on
line diff
--- a/mainwindow.h	Mon Jan 10 13:30:19 2011 +0000
+++ b/mainwindow.h	Mon Jan 10 15:18:21 2011 +0000
@@ -211,9 +211,9 @@
 
     bool shouldHgStat;
 
-    QString findDiffBinaryName();
-    QString findMergeBinaryName();
-    QString findEditorBinaryName();
+    QString getDiffBinaryName();
+    QString getMergeBinaryName();
+    QString getEditorBinaryName();
 
     QFileSystemWatcher *fsWatcher;
     QTimer *m_fsWatcherGeneralTimer;