Mercurial > hg > easyhg
comparison filestatuswidget.h @ 163:5c262ac73948
* First cut of work on merge/resolve logic
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 19:35:04 +0000 |
parents | 78374cefa10f |
children | 6c15700f4103 |
comparison
equal
deleted
inserted
replaced
162:910c2c5d1873 | 163:5c262ac73948 |
---|---|
62 QStringList getAllAddableFiles() const; | 62 QStringList getAllAddableFiles() const; |
63 | 63 |
64 QStringList getSelectedRemovableFiles() const; | 64 QStringList getSelectedRemovableFiles() const; |
65 QStringList getAllRemovableFiles() const; | 65 QStringList getAllRemovableFiles() const; |
66 | 66 |
67 QStringList getSelectedUnresolvedFiles() const; | |
68 QStringList getAllUnresolvedFiles() const; | |
69 | |
67 signals: | 70 signals: |
68 void selectionChanged(); | 71 void selectionChanged(); |
69 | 72 |
70 public slots: | 73 public slots: |
71 void clearSelections(); | 74 void clearSelections(); |