Mercurial > hg > easyhg

diff src/changesetitem.h @ 400:07eaf4e6003a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "item_appearance_adjustments"
author Chris Cannam
date Wed, 25 May 2011 14:59:09 +0100
parents b1f0fa991c49
children 8bdc8f27d19c
line wrap: on
line diff
--- a/src/changesetitem.h	Tue May 24 13:29:27 2011 +0100
+++ b/src/changesetitem.h	Wed May 25 14:59:09 2011 +0100
@@ -25,6 +25,7 @@
 class ChangesetDetailItem;
 
 class QAction;
+class QImage;
 
 class ChangesetItem : public QGraphicsObject
 {
@@ -100,6 +101,12 @@
 
     QMap<QAction *, QString> m_parentDiffActions;
     QMap<QAction *, QString> m_summaryActions;
+
+    static QImage *m_star;
+
+    bool isMerge() const;
+    void paintNormal(QPainter *);
+    void paintMerge(QPainter *);
 };
 
 #endif // CHANGESETITEM_H