Mercurial > hg > easyhg
comparison src/changesetitem.h @ 399:b1f0fa991c49 item_appearance_adjustments
Use circle presentation for uncommitted merge as well as merge changeset
author | Chris Cannam |
---|---|
date | Wed, 25 May 2011 14:58:49 +0100 |
parents | ef31a55c86b6 |
children | 8bdc8f27d19c |
comparison
equal
deleted
inserted
replaced
398:4f3d96c1916f | 399:b1f0fa991c49 |
---|---|
103 QMap<QAction *, QString> m_summaryActions; | 103 QMap<QAction *, QString> m_summaryActions; |
104 | 104 |
105 static QImage *m_star; | 105 static QImage *m_star; |
106 | 106 |
107 bool isMerge() const; | 107 bool isMerge() const; |
108 virtual void paintNormal(QPainter *); | 108 void paintNormal(QPainter *); |
109 virtual void paintMerge(QPainter *); | 109 void paintMerge(QPainter *); |
110 }; | 110 }; |
111 | 111 |
112 #endif // CHANGESETITEM_H | 112 #endif // CHANGESETITEM_H |