Mercurial > hg > easyhg
comparison src/filestates.cpp @ 548:dca5bd5b2a06
Merge from branch "fswatcher"
author | Chris Cannam |
---|---|
date | Tue, 14 Feb 2012 17:55:39 +0000 |
parents | 0a16db274f2c |
children | 533519ebc0cb |
comparison
equal
deleted
inserted
replaced
537:a4e699d32a9a | 548:dca5bd5b2a06 |
---|---|
140 bool FileStates::isKnown(QString file) const | 140 bool FileStates::isKnown(QString file) const |
141 { | 141 { |
142 return (m_stateMap.contains(file)); | 142 return (m_stateMap.contains(file)); |
143 } | 143 } |
144 | 144 |
145 QStringList FileStates::trackedFiles() const | |
146 { | |
147 QStringList all; | |
148 all << filesInState(Modified); | |
149 all << filesInState(Added); | |
150 all << filesInState(Removed); | |
151 all << filesInState(InConflict); | |
152 all << filesInState(Missing); | |
153 all << filesInState(Clean); | |
154 return all; | |
155 } | |
156 | |
145 FileStates::Activities FileStates::activitiesSupportedBy(State s) | 157 FileStates::Activities FileStates::activitiesSupportedBy(State s) |
146 { | 158 { |
147 Activities a; | 159 Activities a; |
148 | 160 |
149 switch (s) { | 161 switch (s) { |