Mercurial > hg > easyhg
view filestates.h @ 195:ff0d76dcb3b8
* Don't close proc input on finished() -- causes crash on program failure on Windows
* Use merge binary from settings, even if empty -- sometimes user may wish to set an empty string to avoid having an external merge program
* Revert labels to line edits in settings dialog, for a similar reason (permit setting empty value)
* Avoid showing hard hyphens on Windows, they don't look right
* Use preformatted text for merge outcome dialog (but format3 would be better)
author | Chris Cannam |
---|---|
date | Fri, 24 Dec 2010 13:14:45 +0000 |
parents | 5c262ac73948 |
children | f16fe0db11f3 |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* EasyMercurial Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen Copyright (c) 2010 Chris Cannam Copyright (c) 2010 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #ifndef FILESTATES_H #define FILESTATES_H #include <QStringList> #include <QMap> #include <QString> class FileStates { public: FileStates(); enum State { // These are in the order in which they want to be listed in // the interface Modified, Added, Removed, InConflict, Missing, Clean, Unknown, FirstState = Modified, LastState = Unknown }; void parseStates(QString text); void clearBuckets(); QStringList getFilesInState(State) const; QStringList modified() const { return m_modified; } QStringList added() const { return m_added; } QStringList unknown() const { return m_unknown; } QStringList removed() const { return m_removed; } QStringList missing() const { return m_missing; } QStringList inConflict() const { return m_inConflict; } State getStateOfFile(QString file) const; private: QStringList m_modified; QStringList m_added; QStringList m_unknown; QStringList m_removed; QStringList m_missing; QStringList m_inConflict; QMap<QString, State> m_stateMap; State charToState(QChar, bool * = 0); QStringList *stateToBucket(State); }; #endif // FILESTATES_H