comparison src/changesetitem.h @ 387:ce6a70970808 item_appearance_adjustments

Use a plain small circle for merge commits
author Chris Cannam
date Tue, 24 May 2011 16:26:15 +0100
parents b9c153e00e84
children ef31a55c86b6
comparison
equal deleted inserted replaced
386:7ef46fb73b48 387:ce6a70970808
98 bool m_current; 98 bool m_current;
99 bool m_new; 99 bool m_new;
100 100
101 QMap<QAction *, QString> m_parentDiffActions; 101 QMap<QAction *, QString> m_parentDiffActions;
102 QMap<QAction *, QString> m_summaryActions; 102 QMap<QAction *, QString> m_summaryActions;
103
104 bool isMerge() const;
105 virtual void paintNormal(QPainter *);
106 virtual void paintMerge(QPainter *);
103 }; 107 };
104 108
105 #endif // CHANGESETITEM_H 109 #endif // CHANGESETITEM_H