comparison src/changesetitem.h @ 400:07eaf4e6003a

Merge from branch "item_appearance_adjustments"

 
 class Changeset;
 class ChangesetDetailItem;
 
 class QAction;
+class QImage;
 
 class ChangesetItem : public QGraphicsObject
 {
     Q_OBJECT
 

     bool m_current;
     bool m_new;
 
     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