Mercurial > hg > easyhg
comparison src/hgtabwidget.h @ 559:95877ad67d3e
Merge from branch "find"
author | Chris Cannam |
---|---|
date | Mon, 27 Feb 2012 17:08:47 +0000 |
parents | a1d210c767ab |
children | 533519ebc0cb |
comparison
equal
deleted
inserted
replaced
553:9c8147c9f245 | 559:95877ad67d3e |
---|---|
111 public slots: | 111 public slots: |
112 void clearSelections(); | 112 void clearSelections(); |
113 void showWorkTab(); | 113 void showWorkTab(); |
114 void showHistoryTab(); | 114 void showHistoryTab(); |
115 | 115 |
116 void setSearchText(QString text); | |
117 | |
116 private: | 118 private: |
117 FileStatusWidget *m_fileStatusWidget; | 119 FileStatusWidget *m_fileStatusWidget; |
118 HistoryWidget *m_historyWidget; | 120 HistoryWidget *m_historyWidget; |
119 FileStates m_fileStates; | 121 FileStates m_fileStates; |
120 bool m_haveMerge; | 122 bool m_haveMerge; |