Mercurial > hg > easyhg
comparison src/filestates.cpp @ 422:2af4b5b0bf83
Merge from branch "ignore"
| author | Chris Cannam <chris.cannam@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 22 Jun 2011 13:01:50 +0100 |
| parents | 653e9694a694 |
| children | 0a16db274f2c |
comparison
equal
deleted
inserted
replaced
| 412:498c2ca0b367 | 422:2af4b5b0bf83 |
|---|---|
| 135 << "thing as unknown state..." | 135 << "thing as unknown state..." |
| 136 << endl; | 136 << endl; |
| 137 return Unknown; | 137 return Unknown; |
| 138 } | 138 } |
| 139 | 139 |
| 140 bool FileStates::isKnown(QString file) const | |
| 141 { | |
| 142 return (m_stateMap.contains(file)); | |
| 143 } | |
| 144 | |
| 140 FileStates::Activities FileStates::activitiesSupportedBy(State s) | 145 FileStates::Activities FileStates::activitiesSupportedBy(State s) |
| 141 { | 146 { |
| 142 Activities a; | 147 Activities a; |
| 143 | 148 |
| 144 switch (s) { | 149 switch (s) { |