Mercurial > hg > easyhg
diff mainwindow.h @ 112:4bd17f36d059
* Make diff binary a settings property; some tidying
author | Chris Cannam |
---|---|
date | Fri, 26 Nov 2010 17:02:55 +0000 |
parents | 1721c580c10e |
children | c92f5859c707 |
line wrap: on
line diff
--- a/mainwindow.h Fri Nov 26 16:28:18 2010 +0000 +++ b/mainwindow.h Fri Nov 26 17:02:55 2010 +0000 @@ -56,7 +56,6 @@ public slots: void hgQueryPaths(); void hgStat(); -// void tabChanged(int currTab); void commandCompleted(HgAction action, QString stdout); void commandFailed(HgAction action, QString stdout); void enableDisableActions(); @@ -186,11 +185,12 @@ HgRunner *runner; + void findDiffBinaryName(); + QString diffBinaryName; + QFileSystemWatcher *fsWatcher; -// int tabPage; -// unsigned char initialFileTypesBits; - bool justMerged; + bool justMerged; }; #endif